diff src/share/vm/opto/type.cpp @ 12816:2720ab7a0d70

Merge
author ccheung
date Fri, 04 Oct 2013 21:00:43 -0700
parents c9ccd7b85f20
children b2ee5dc63353
line wrap: on
line diff
--- a/src/share/vm/opto/type.cpp	Sat Oct 05 03:14:53 2013 +0200
+++ b/src/share/vm/opto/type.cpp	Fri Oct 04 21:00:43 2013 -0700
@@ -430,6 +430,11 @@
   longpair[1] = TypeLong::LONG;
   TypeTuple::LONG_PAIR = TypeTuple::make(2, longpair);
 
+  const Type **intccpair = TypeTuple::fields(2);
+  intccpair[0] = TypeInt::INT;
+  intccpair[1] = TypeInt::CC;
+  TypeTuple::INT_CC_PAIR = TypeTuple::make(2, intccpair);
+
   _const_basic_type[T_NARROWOOP]   = TypeNarrowOop::BOTTOM;
   _const_basic_type[T_NARROWKLASS] = Type::BOTTOM;
   _const_basic_type[T_BOOLEAN]     = TypeInt::BOOL;
@@ -1646,6 +1651,7 @@
 const TypeTuple *TypeTuple::START_I2C;
 const TypeTuple *TypeTuple::INT_PAIR;
 const TypeTuple *TypeTuple::LONG_PAIR;
+const TypeTuple *TypeTuple::INT_CC_PAIR;
 
 
 //------------------------------make-------------------------------------------