--- old/src/cpu/x86/vm/nativeInst_x86.hpp	2015-08-12 14:09:01.000000000 +0200
+++ new/src/cpu/x86/vm/nativeInst_x86.hpp	2015-08-12 14:09:01.000000000 +0200
@@ -526,7 +526,11 @@
 inline bool NativeInstruction::is_cond_jump()    { return (int_at(0) & 0xF0FF) == 0x800F /* long jump */ ||
                                                           (ubyte_at(0) & 0xF0) == 0x70;  /* short jump */ }
 inline bool NativeInstruction::is_safepoint_poll() {
+  // TODO: Fix up parsing of safepoint poll code. Skipping now as it doesn't seem to be used for much other than asserts.
 #ifdef AMD64
+  if (ThreadLocalSafepoints) {
+    return true;
+  }
   if (Assembler::is_polling_page_far()) {
     // two cases, depending on the choice of the base register in the address.
     if (((ubyte_at(0) & NativeTstRegMem::instruction_rex_prefix_mask) == NativeTstRegMem::instruction_rex_prefix &&