# HG changeset patch
# User jiangli
# Date 1416272202 0
# Node ID f84125b6f69a64ed2367f54debf8b6cdb8681998
# Parent  3375833a603e97da17524ebc4d32d22e3f43479c# Parent  b00e231d3cb2839989201a94d45561b78cf0cd1b
Merge

diff -r b00e231d3cb2 -r f84125b6f69a src/os_cpu/windows_x86/vm/os_windows_x86.cpp
--- a/src/os_cpu/windows_x86/vm/os_windows_x86.cpp	Mon Nov 17 21:05:08 2014 +0000
+++ b/src/os_cpu/windows_x86/vm/os_windows_x86.cpp	Tue Nov 18 00:56:42 2014 +0000
@@ -635,7 +635,11 @@
 #ifndef PRODUCT
 void os::verify_stack_alignment() {
 #ifdef AMD64
-  assert(((intptr_t)os::current_stack_pointer() & (StackAlignmentInBytes-1)) == 0, "incorrect stack alignment");
+  // The current_stack_pointer() calls generated get_previous_sp stub routine.
+  // Only enable the assert after the routine becomes available.
+  if (StubRoutines::code1() != NULL) {
+    assert(((intptr_t)os::current_stack_pointer() & (StackAlignmentInBytes-1)) == 0, "incorrect stack alignment");
+  }
 #endif
 }
 #endif
diff -r b00e231d3cb2 -r f84125b6f69a src/share/vm/classfile/classLoader.cpp
--- a/src/share/vm/classfile/classLoader.cpp	Mon Nov 17 21:05:08 2014 +0000
+++ b/src/share/vm/classfile/classLoader.cpp	Tue Nov 18 00:56:42 2014 +0000
@@ -1137,7 +1137,7 @@
     h = context.record_result(classpath_index, e, result, THREAD);
   } else {
     if (DumpSharedSpaces) {
-      tty->print_cr("Preload Error: Cannot find %s", class_name);
+      tty->print_cr("Preload Warning: Cannot find %s", class_name);
     }
   }
 
diff -r b00e231d3cb2 -r f84125b6f69a src/share/vm/classfile/dictionary.cpp
--- a/src/share/vm/classfile/dictionary.cpp	Mon Nov 17 21:05:08 2014 +0000
+++ b/src/share/vm/classfile/dictionary.cpp	Tue Nov 18 00:56:42 2014 +0000
@@ -223,7 +223,7 @@
         }
         free_entry(probe);
         ResourceMark rm;
-        tty->print_cr("Removed error class: %s", ik->external_name());
+        tty->print_cr("Preload Warning: Removed error class: %s", ik->external_name());
         continue;
       }
 
diff -r b00e231d3cb2 -r f84125b6f69a src/share/vm/memory/metaspaceShared.cpp
--- a/src/share/vm/memory/metaspaceShared.cpp	Mon Nov 17 21:05:08 2014 +0000
+++ b/src/share/vm/memory/metaspaceShared.cpp	Tue Nov 18 00:56:42 2014 +0000
@@ -851,7 +851,7 @@
     ik->link_class(THREAD);
     if (HAS_PENDING_EXCEPTION) {
       ResourceMark rm;
-      tty->print_cr("Preload Error: Verification failed for %s",
+      tty->print_cr("Preload Warning: Verification failed for %s",
                     ik->external_name());
       CLEAR_PENDING_EXCEPTION;
       ik->set_in_error_state();