< prev index next >

src/share/vm/runtime/stubRoutines.cpp

Print this page
@  rev 7996 : 8075533: Zero JVM segfaults for -version after JDK-8074552
|

@@ -209,10 +209,11 @@
   for (i = 0; i < sizeof(lbuffer); i++) {
     assert(fbuffer[i] == v && fbuffer2[i] == v2, "shouldn't have copied anything");
   }
 }
 
+#ifndef ZERO
 // simple test for SafeFetch32
 static void test_safefetch32() {
   int dummy = 17;
   int* const p_invalid = (int*) get_segfault_address();
   int* const p_valid = &dummy;

@@ -238,10 +239,11 @@
   assert(result_invalid == v2, "SafeFetchN error");
   intptr_t result_valid = SafeFetchN(p_valid, v2);
   assert(result_valid == v1, "SafeFetchN error");
 }
 #endif
+#endif // ZERO
 
 void StubRoutines::initialize2() {
   if (_code2 == NULL) {
     ResourceMark rm;
     TraceTime timer("StubRoutines generation 2", TraceStartupTime);

@@ -328,11 +330,11 @@
   test_arraycopy_func(CAST_FROM_FN_PTR(address, Copy::aligned_conjoint_words), sizeof(jlong));
   test_arraycopy_func(CAST_FROM_FN_PTR(address, Copy::aligned_disjoint_words), sizeof(jlong));
 
   // test safefetch routines
   // Not on Windows 32bit until 8074860 is fixed
-#if ! (defined(_WIN32) && defined(_M_IX86))
+#if ! (defined(_WIN32) && defined(_M_IX86) ) && ! defined(ZERO)
   test_safefetch32();
   test_safefetchN();
 #endif
 
 #endif
< prev index next >