hotspot/src/cpu/ppc/vm/frame_ppc.cpp
changeset 44093 e22e0d071bf9
parent 44088 fb5421685295
child 44406 a46a6c4d1dd9
--- a/hotspot/src/cpu/ppc/vm/frame_ppc.cpp	Mon Feb 27 17:36:36 2017 +0100
+++ b/hotspot/src/cpu/ppc/vm/frame_ppc.cpp	Thu Mar 02 17:46:59 2017 +0100
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012, 2017 SAP SE. All rights reserved.
+ * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -171,7 +171,10 @@
     switch (method->result_type()) {
       case T_OBJECT:
       case T_ARRAY: {
-        *oop_result = JNIHandles::resolve(*(jobject*)lresult);
+        oop* obj_p = *(oop**)lresult;
+        oop obj = (obj_p == NULL) ? (oop)NULL : *obj_p;
+        assert(obj == NULL || Universe::heap()->is_in(obj), "sanity check");
+        *oop_result = obj;
         break;
       }
       // We use std/stfd to store the values.