changeset 9653:6acc55e6cf00

Merge
author dholmes
date Thu, 29 Oct 2015 21:38:25 -0400
parents f81484d852ac 97a7ba9f10cf
children 6e76f1f75b89 b352019b1fca
files
diffstat 4 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Oct 29 12:04:04 2015 -0700
+++ b/.hgtags	Thu Oct 29 21:38:25 2015 -0400
@@ -489,3 +489,5 @@
 184c4328444974edd6b3b490b9d0177ace7e331c jdk9-b84
 03845376ea9dbf9690b6a9cfb4ed63f8cc0541c0 jdk9-b85
 1ae4191359d811a51512f17dca80ffe79837a5ff jdk9-b86
+d7ffd16382fe7071181b967932b47cff6d1312e1 jdk9-b87
+bc48b669bc6610fac97e16593050c0f559cf6945 jdk9-b88
--- a/make/gensrc/Gensrc-jdk.vm.ci.gmk	Thu Oct 29 12:04:04 2015 -0700
+++ b/make/gensrc/Gensrc-jdk.vm.ci.gmk	Thu Oct 29 21:38:25 2015 -0400
@@ -77,6 +77,7 @@
 	$(MKDIR) -p $(@D)
 	$(eval $(call ListPathsSafely,PROC_SRCS,$(@D)/_gensrc_proc_files))
 	$(JAVA_SMALL) $(NEW_JAVAC) \
+	    -XDignore.symbol.file \
 	    -sourcepath $(SOURCEPATH) \
 	    -implicit:none \
 	    -proc:only \
--- a/src/share/vm/oops/constantPool.cpp	Thu Oct 29 12:04:04 2015 -0700
+++ b/src/share/vm/oops/constantPool.cpp	Thu Oct 29 21:38:25 2015 -0400
@@ -111,7 +111,7 @@
 // to map it back for resolving and some unlikely miscellaneous uses.
 // The objects created by invokedynamic are appended to this list.
 void ConstantPool::initialize_resolved_references(ClassLoaderData* loader_data,
-                                                  intStack reference_map,
+                                                  const intStack& reference_map,
                                                   int constant_pool_map_length,
                                                   TRAPS) {
   // Initialized the resolved object cache.
--- a/src/share/vm/oops/constantPool.hpp	Thu Oct 29 12:04:04 2015 -0700
+++ b/src/share/vm/oops/constantPool.hpp	Thu Oct 29 21:38:25 2015 -0400
@@ -185,7 +185,7 @@
 
   // Create object cache in the constant pool
   void initialize_resolved_references(ClassLoaderData* loader_data,
-                                      intStack reference_map,
+                                      const intStack& reference_map,
                                       int constant_pool_map_length,
                                       TRAPS);