changeset 7402:ed802e0ac3c4

Merge
author coleenp
date Wed, 12 Nov 2014 20:18:13 -0500
parents 9dc4d4fc73ca 90b2b496d9b7
children 0a03986bd915
files
diffstat 1 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/os_cpu/windows_x86/vm/os_windows_x86.cpp	Thu Nov 13 01:57:09 2014 +0300
+++ b/src/os_cpu/windows_x86/vm/os_windows_x86.cpp	Wed Nov 12 20:18:13 2014 -0500
@@ -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