Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authorroland
Tue, 13 Oct 2015 13:23:42 +0000
changeset 33173 1019481697e4
parent 33171 25ea04039ff9 (current diff)
parent 33172 06453a29bc41 (diff)
child 33174 8409d7fe20cc
Merge
--- a/hotspot/src/share/vm/opto/library_call.cpp	Tue Oct 13 10:09:57 2015 +0200
+++ b/hotspot/src/share/vm/opto/library_call.cpp	Tue Oct 13 13:23:42 2015 +0000
@@ -1762,8 +1762,9 @@
   case vmIntrinsics::_dabs:   return Matcher::has_match_rule(Op_AbsD)   ? inline_math(id) : false;
 
   case vmIntrinsics::_dexp:
-    return (UseSSE >= 2) ? runtime_math(OptoRuntime::Math_D_D_Type(), StubRoutines::dexp(),  "dexp") :
-    runtime_math(OptoRuntime::Math_D_D_Type(), FN_PTR(SharedRuntime::dexp),  "EXP");
+    return StubRoutines::dexp() != NULL ?
+      runtime_math(OptoRuntime::Math_D_D_Type(), StubRoutines::dexp(),  "dexp") :
+      runtime_math(OptoRuntime::Math_D_D_Type(), FN_PTR(SharedRuntime::dexp),  "EXP");
   case vmIntrinsics::_dpow:   return Matcher::has_match_rule(Op_PowD)   ? inline_pow()    :
     runtime_math(OptoRuntime::Math_DD_D_Type(), FN_PTR(SharedRuntime::dpow),  "POW");
 #undef FN_PTR
jdk-sandbox