diff src/share/vm/opto/runtime.cpp @ 6154:5142b5110214

Merge
author asaha
date Tue, 08 May 2012 07:29:27 -0700
parents 1e76463170b3 0105f367a14c
children 957c266d8bc5 a5dd6e3ef9f3
line wrap: on
line diff
--- a/src/share/vm/opto/runtime.cpp	Thu Apr 12 12:07:09 2012 -0700
+++ b/src/share/vm/opto/runtime.cpp	Tue May 08 07:29:27 2012 -0700
@@ -709,9 +709,9 @@
   return TypeFunc::make(domain, range);
 }
 
-//-------------- currentTimeMillis
+//-------------- currentTimeMillis, currentTimeNanos, etc
 
-const TypeFunc* OptoRuntime::current_time_millis_Type() {
+const TypeFunc* OptoRuntime::void_long_Type() {
   // create input type (domain)
   const Type **fields = TypeTuple::fields(0);
   const TypeTuple *domain = TypeTuple::make(TypeFunc::Parms+0, fields);