changeset 34276:fef7c43ec4a5

Merge
author ddmitriev
date Tue, 24 Nov 2015 13:58:08 +0000
parents 9b1771bfd6cf b2bbfc960e8f
children d457b9400c99
files
diffstat 4 files changed, 18 insertions(+), 39 deletions(-) [+]
line wrap: on
line diff
--- a/hotspot/src/cpu/aarch64/vm/interp_masm_aarch64.cpp	Tue Nov 24 09:42:05 2015 +0300
+++ b/hotspot/src/cpu/aarch64/vm/interp_masm_aarch64.cpp	Tue Nov 24 13:58:08 2015 +0000
@@ -189,10 +189,11 @@
   get_cache_and_index_at_bcp(cache, index, bcp_offset, index_size);
   // We use a 32-bit load here since the layout of 64-bit words on
   // little-endian machines allow us that.
-  // n.b. unlike x86 cache alreeady includes the index offset
-  ldrw(bytecode, Address(cache,
+  // n.b. unlike x86 cache already includes the index offset
+  lea(bytecode, Address(cache,
                          ConstantPoolCache::base_offset()
                          + ConstantPoolCacheEntry::indices_offset()));
+  ldarw(bytecode, bytecode);
   const int shift_count = (1 + byte_no) * BitsPerByte;
   ubfx(bytecode, bytecode, shift_count, BitsPerByte);
 }
--- a/hotspot/src/share/vm/gc/g1/g1RemSet.hpp	Tue Nov 24 09:42:05 2015 +0300
+++ b/hotspot/src/share/vm/gc/g1/g1RemSet.hpp	Tue Nov 24 13:58:08 2015 +0000
@@ -54,16 +54,6 @@
   uint n_workers();
 
 protected:
-  enum SomePrivateConstants {
-    UpdateRStoMergeSync  = 0,
-    MergeRStoDoDirtySync = 1,
-    DoDirtySync          = 2,
-    LastSync             = 3,
-
-    SeqTask              = 0,
-    NumSeqTasks          = 1
-  };
-
   CardTableModRefBS*     _ct_bs;
   G1CollectorPolicy*     _g1p;
 
@@ -123,7 +113,6 @@
 
   // Record, if necessary, the fact that *p (where "p" is in region "from",
   // which is required to be non-NULL) has changed to a new non-NULL value.
-  template <class T> void write_ref(HeapRegion* from, T* p);
   template <class T> void par_write_ref(HeapRegion* from, T* p, uint tid);
 
   // Requires "region_bm" and "card_bm" to be bitmaps with 1 bit per region
--- a/hotspot/src/share/vm/gc/g1/g1RemSet.inline.hpp	Tue Nov 24 09:42:05 2015 +0300
+++ b/hotspot/src/share/vm/gc/g1/g1RemSet.inline.hpp	Tue Nov 24 13:58:08 2015 +0000
@@ -35,11 +35,6 @@
 }
 
 template <class T>
-inline void G1RemSet::write_ref(HeapRegion* from, T* p) {
-  par_write_ref(from, p, 0);
-}
-
-template <class T>
 inline void G1RemSet::par_write_ref(HeapRegion* from, T* p, uint tid) {
   oop obj = oopDesc::load_decode_heap_oop(p);
   if (obj == NULL) {
--- a/hotspot/test/runtime/CommandLine/IgnoreUnrecognizedVMOptions.java	Tue Nov 24 09:42:05 2015 +0300
+++ b/hotspot/test/runtime/CommandLine/IgnoreUnrecognizedVMOptions.java	Tue Nov 24 13:58:08 2015 +0000
@@ -131,47 +131,41 @@
 
     /*
       #1.7 locked flag:
-                                      diagnostic & locked             experimental & locked             commercial & locked
-                                      -XX:-UnlockDiagnosticVMOptions  -XX:-UnlockExperimentalVMOptions  -XX:-UnlockCommercialFeatures
-                                      -XX:+PrintInlining              -XX:+AlwaysSafeConstructors       -XX:+FlightRecorder
-      -IgnoreUnrecognizedVMOptions               ERR                           ERR                                 ERR
-      +IgnoreUnrecognizedVMOptions               ERR                           ERR                                 ERR
+                                      diagnostic & locked             experimental & locked
+                                      -XX:-UnlockDiagnosticVMOptions  -XX:-UnlockExperimentalVMOptions
+                                      -XX:+PrintInlining              -XX:+AlwaysSafeConstructors
+      -IgnoreUnrecognizedVMOptions               ERR                           ERR
+      +IgnoreUnrecognizedVMOptions               ERR                           ERR
     */
     runJavaAndCheckExitValue(false, "-XX:-IgnoreUnrecognizedVMOptions", "-XX:-UnlockDiagnosticVMOptions", "-XX:+PrintInlining", "-version");
     runJavaAndCheckExitValue(false, "-XX:-IgnoreUnrecognizedVMOptions", "-XX:-UnlockExperimentalVMOptions", "-XX:+AlwaysSafeConstructors", "-version");
-    runJavaAndCheckExitValue(false, "-XX:-IgnoreUnrecognizedVMOptions", "-XX:-UnlockCommercialFeatures", "-XX:+FlightRecorder", "-version");
     runJavaAndCheckExitValue(false, "-XX:+IgnoreUnrecognizedVMOptions", "-XX:-UnlockDiagnosticVMOptions", "-XX:+PrintInlining", "-version");
     runJavaAndCheckExitValue(false, "-XX:+IgnoreUnrecognizedVMOptions", "-XX:-UnlockExperimentalVMOptions", "-XX:+AlwaysSafeConstructors", "-version");
-    runJavaAndCheckExitValue(false, "-XX:+IgnoreUnrecognizedVMOptions", "-XX:-UnlockCommercialFeatures", "-XX:+FlightRecorder", "-version");
 
     /*
       #1.8 malformed locked flag:
-                                    diagnostic & locked             experimental & locked             commercial & locked
-                                    -XX:-UnlockDiagnosticVMOptions  -XX:-UnlockExperimentalVMOptions  -XX:-UnlockCommercialFeatures
-                                    -XX:PrintInlining               -XX:AlwaysSafeConstructors        -XX:FlightRecorder
-      -IgnoreUnrecognizedVMOptions               ERR                           ERR                                 ERR
-      +IgnoreUnrecognizedVMOptions               ERR                           ERR                                 ERR
+                                    diagnostic & locked             experimental & locked
+                                    -XX:-UnlockDiagnosticVMOptions  -XX:-UnlockExperimentalVMOptions
+                                    -XX:PrintInlining               -XX:AlwaysSafeConstructors
+      -IgnoreUnrecognizedVMOptions               ERR                           ERR
+      +IgnoreUnrecognizedVMOptions               ERR                           ERR
     */
     runJavaAndCheckExitValue(false, "-XX:-IgnoreUnrecognizedVMOptions", "-XX:-UnlockDiagnosticVMOptions", "-XX:PrintInlining", "-version");
     runJavaAndCheckExitValue(false, "-XX:-IgnoreUnrecognizedVMOptions", "-XX:-UnlockExperimentalVMOptions", "-XX:AlwaysSafeConstructors", "-version");
-    runJavaAndCheckExitValue(false, "-XX:-IgnoreUnrecognizedVMOptions", "-XX:-UnlockCommercialFeatures", "-XX:FlightRecorder", "-version");
     runJavaAndCheckExitValue(false, "-XX:+IgnoreUnrecognizedVMOptions", "-XX:-UnlockDiagnosticVMOptions", "-XX:PrintInlining", "-version");
     runJavaAndCheckExitValue(false, "-XX:+IgnoreUnrecognizedVMOptions", "-XX:-UnlockExperimentalVMOptions", "-XX:AlwaysSafeConstructors", "-version");
-    runJavaAndCheckExitValue(false, "-XX:+IgnoreUnrecognizedVMOptions", "-XX:-UnlockCommercialFeatures", "-XX:FlightRecorder", "-version");
 
     /*
       #1.9 malformed unlocked flag:
-                                    diagnostic & locked             experimental & locked             commercial & locked
-                                    -XX:+UnlockDiagnosticVMOptions  -XX:+UnlockExperimentalVMOptions  -XX:+UnlockCommercialFeatures
-                                    -XX:PrintInlining               -XX:AlwaysSafeConstructors        -XX:FlightRecorder
-      -IgnoreUnrecognizedVMOptions               ERR                           ERR                                 ERR
-      +IgnoreUnrecognizedVMOptions               ERR                           ERR                                 ERR
+                                    diagnostic & locked             experimental & locked
+                                    -XX:+UnlockDiagnosticVMOptions  -XX:+UnlockExperimentalVMOptions
+                                    -XX:PrintInlining               -XX:AlwaysSafeConstructors
+      -IgnoreUnrecognizedVMOptions               ERR                           ERR
+      +IgnoreUnrecognizedVMOptions               ERR                           ERR
     */
     runJavaAndCheckExitValue(false, "-XX:-IgnoreUnrecognizedVMOptions", "-XX:-UnlockDiagnosticVMOptions", "-XX:PrintInlining", "-version");
     runJavaAndCheckExitValue(false, "-XX:-IgnoreUnrecognizedVMOptions", "-XX:-UnlockExperimentalVMOptions", "-XX:AlwaysSafeConstructors", "-version");
-    runJavaAndCheckExitValue(false, "-XX:-IgnoreUnrecognizedVMOptions", "-XX:-UnlockCommercialFeatures", "-XX:FlightRecorder", "-version");
     runJavaAndCheckExitValue(false, "-XX:+IgnoreUnrecognizedVMOptions", "-XX:-UnlockDiagnosticVMOptions", "-XX:PrintInlining", "-version");
     runJavaAndCheckExitValue(false, "-XX:+IgnoreUnrecognizedVMOptions", "-XX:-UnlockExperimentalVMOptions", "-XX:AlwaysSafeConstructors", "-version");
-    runJavaAndCheckExitValue(false, "-XX:+IgnoreUnrecognizedVMOptions", "-XX:-UnlockCommercialFeatures", "-XX:FlightRecorder", "-version");
   }
 }