Mercurial > hg > release > icedtea7-forest-2.6 > hotspot

changeset 6664:6941480b5b05

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge jdk7u191-b00
author andrew
date Mon, 02 Jul 2018 15:58:25 +0100
parents 307eb3563046 (current diff) b95ee63b279a (diff)
children efa98ed4bd43
files .hgtags src/share/vm/classfile/classLoaderDependencies.cpp src/share/vm/classfile/classLoaderDependencies.hpp src/share/vm/code/dependencies.cpp
diffstat 4 files changed, 11 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Fri Jun 29 17:43:42 2018 +0100
+++ b/.hgtags	Mon Jul 02 15:58:25 2018 +0100
@@ -923,3 +923,8 @@
 6865c5a6ec36e80772ec47e14f7926b92053b551 jdk7u181-b01
 56142fb6814b3fbe81d580622583829976c6d08e icedtea-2.6.14
 592120da2a2b32c188d93212dd1929064e0723f0 icedtea-2.6.15pre01
+0000000000000000000000000000000000000000 jdk7u181-b00
+82e6757505da54dc58be6653c8b3464b58f6cb62 jdk7u181-b00
+0000000000000000000000000000000000000000 jdk7u181-b01
+e5e4dd834ac3a3299c9715f98919a3ab43b5381e jdk7u181-b01
+327ea6f9647c0ef2e872a2adbf9b9fa180dd9070 jdk7u191-b00
--- a/src/share/vm/classfile/classLoaderDependencies.cpp	Fri Jun 29 17:43:42 2018 +0100
+++ b/src/share/vm/classfile/classLoaderDependencies.cpp	Mon Jul 02 15:58:25 2018 +0100
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2018, Red Hat, Inc. and/or its affiliates.
- * 
+ *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/src/share/vm/classfile/classLoaderDependencies.hpp	Fri Jun 29 17:43:42 2018 +0100
+++ b/src/share/vm/classfile/classLoaderDependencies.hpp	Mon Jul 02 15:58:25 2018 +0100
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2018, Red Hat, Inc. and/or its affiliates.
- * 
+ *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/src/share/vm/code/dependencies.cpp	Fri Jun 29 17:43:42 2018 +0100
+++ b/src/share/vm/code/dependencies.cpp	Mon Jul 02 15:58:25 2018 +0100
@@ -822,9 +822,9 @@
       methodOop m = instanceKlass::cast(k)->find_instance_method(_name, _signature);
       if (!Dependencies::is_concrete_method(m)) {
         // Check for re-abstraction of method
-	if (!k->klass_part()->is_interface() && m != NULL && m->is_abstract()) {
-	  // Found a matching abstract method 'm' in the class hierarchy.
-	  // This is fine iff 'k' is an abstract class and all concrete subtypes
+        if (!k->klass_part()->is_interface() && m != NULL && m->is_abstract()) {
+          // Found a matching abstract method 'm' in the class hierarchy.
+          // This is fine iff 'k' is an abstract class and all concrete subtypes
           // of 'k' override 'm' and are participates of the current search.
           ClassHierarchyWalker wf(_participants, _num_participants);
           klassOop w = wf.find_witness_subtype(k);
@@ -839,7 +839,7 @@
             }
           }
         }
-	return false;
+        return false;
       }
       _found_methods[_num_participants] = m;
       // Note:  If add_participant(k) is called,