Mercurial > hg > truffle
changeset 20650:f84125b6f69a
Merge
| author | jiangli |
|---|---|
| date | Tue, 18 Nov 2014 00:56:42 +0000 |
| parents | 3375833a603e (diff) b00e231d3cb2 (current diff) |
| children | 600c44255e5f |
| files | |
| diffstat | 4 files changed, 8 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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); } }
--- 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; }
--- 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();