changeset 53269:b2a78e16910f fibers

Merge
author alanb
date Fri, 04 Jan 2019 19:52:34 +0000
parents 19f887f76d49 a9843756d3d8
children d123aad95433 3219c64a719a
files src/hotspot/share/classfile/javaClasses.cpp
diffstat 3 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/hotspot/share/classfile/javaClasses.cpp	Fri Jan 04 18:31:11 2019 +0000
+++ b/src/hotspot/share/classfile/javaClasses.cpp	Fri Jan 04 19:52:34 2019 +0000
@@ -2438,7 +2438,7 @@
   for (frame fr = thread->last_frame(); (max_depth == 0 || max_depth != total_count) && !is_last;) {
     Method* method = NULL;
     int bci = 0;
-    oop contScopeName = cont != NULL ? java_lang_ContinuationScope::name(java_lang_Continuation::scope(cont)) : NULL;
+    oop contScopeName = (cont != NULL) ? java_lang_ContinuationScope::name(java_lang_Continuation::scope(cont)) : (oop)NULL;
 
     // Compiled java method case.
     if (decode_offset != 0) {
@@ -2734,7 +2734,7 @@
   assert((jushort)version == version, "version should be short");
   java_lang_StackFrameInfo::set_version(stackFrame(), (short)version);
 
-  oop contScopeName = cont != NULL ? java_lang_ContinuationScope::name(java_lang_Continuation::scope(cont)): NULL;
+  oop contScopeName = (cont != NULL) ? java_lang_ContinuationScope::name(java_lang_Continuation::scope(cont)) : (oop)NULL;
   java_lang_StackFrameInfo::set_contScopeName(stackFrame(), contScopeName);
 }
 
--- a/src/hotspot/share/runtime/vframe.inline.hpp	Fri Jan 04 18:31:11 2019 +0000
+++ b/src/hotspot/share/runtime/vframe.inline.hpp	Fri Jan 04 19:52:34 2019 +0000
@@ -26,6 +26,7 @@
 #define SHARE_VM_RUNTIME_VFRAME_INLINE_HPP
 
 #include "classfile/javaClasses.inline.hpp"
+#include "runtime/handles.inline.hpp"
 #include "runtime/frame.inline.hpp"
 #include "runtime/vframe.hpp"
 
--- a/src/hotspot/share/services/threadService.cpp	Fri Jan 04 18:31:11 2019 +0000
+++ b/src/hotspot/share/services/threadService.cpp	Fri Jan 04 19:52:34 2019 +0000
@@ -23,6 +23,7 @@
  */
 
 #include "precompiled.hpp"
+#include "classfile/javaClasses.inline.hpp"
 #include "classfile/systemDictionary.hpp"
 #include "memory/allocation.hpp"
 #include "memory/heapInspection.hpp"
@@ -537,7 +538,7 @@
   _bci = jvf->bci();
   _class_holder = _method->method_holder()->klass_holder();
   _locked_monitors = NULL;
-  _cont_scope_name = jvf->continuation() != NULL ? java_lang_ContinuationScope::name(java_lang_Continuation::scope(jvf->continuation())) : NULL;
+  _cont_scope_name = (jvf->continuation() != NULL) ? java_lang_ContinuationScope::name(java_lang_Continuation::scope(jvf->continuation())) : (oop)NULL;
   if (with_lock_info) {
     ResourceMark rm;
     GrowableArray<MonitorInfo*>* list = jvf->locked_monitors();