--- a/src/share/vm/classfile/javaClasses.cpp	Wed Mar 26 17:30:40 2014 +0100
+++ b/src/share/vm/classfile/javaClasses.cpp	Wed Mar 26 17:33:54 2014 +0100
@@ -1530,6 +1530,16 @@
     }
     return;
   }
+  
+  // Check for gpu exception to add as top frame
+  Method* gpu_method = thread->get_gpu_exception_method();
+  if (gpu_method != NULL) {
+    jint gpu_bci = thread->get_gpu_exception_bci();
+    bt.push(gpu_method, gpu_bci, CHECK);
+    // Clear the gpu exception state, it is not used after here
+    thread->set_gpu_exception_bci(0);
+    thread->set_gpu_exception_method(NULL);  
+  }
 
   // Instead of using vframe directly, this version of fill_in_stack_trace
   // basically handles everything by hand. This significantly improved the