Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/share/vm/shark/sharkType.hpp	Mon Nov 26 17:25:11 2012 -0800
     1.2 +++ b/src/share/vm/shark/sharkType.hpp	Tue Nov 27 12:48:52 2012 -0800
     1.3 @@ -40,82 +40,85 @@
     1.4  
     1.5    // Basic types
     1.6   public:
     1.7 -  static const llvm::Type* void_type() {
     1.8 +  static llvm::Type* void_type() {
     1.9      return context().void_type();
    1.10    }
    1.11 -  static const llvm::IntegerType* bit_type() {
    1.12 +  static llvm::IntegerType* bit_type() {
    1.13      return context().bit_type();
    1.14    }
    1.15 -  static const llvm::IntegerType* jbyte_type() {
    1.16 +  static llvm::IntegerType* jbyte_type() {
    1.17      return context().jbyte_type();
    1.18    }
    1.19 -  static const llvm::IntegerType* jshort_type() {
    1.20 +  static llvm::IntegerType* jshort_type() {
    1.21      return context().jshort_type();
    1.22    }
    1.23 -  static const llvm::IntegerType* jint_type() {
    1.24 +  static llvm::IntegerType* jint_type() {
    1.25      return context().jint_type();
    1.26    }
    1.27 -  static const llvm::IntegerType* jlong_type() {
    1.28 +  static llvm::IntegerType* jlong_type() {
    1.29      return context().jlong_type();
    1.30    }
    1.31 -  static const llvm::Type* jfloat_type() {
    1.32 +  static llvm::Type* jfloat_type() {
    1.33      return context().jfloat_type();
    1.34    }
    1.35 -  static const llvm::Type* jdouble_type() {
    1.36 +  static llvm::Type* jdouble_type() {
    1.37      return context().jdouble_type();
    1.38    }
    1.39 -  static const llvm::IntegerType* intptr_type() {
    1.40 +  static llvm::IntegerType* intptr_type() {
    1.41      return context().intptr_type();
    1.42    }
    1.43  
    1.44    // Compound types
    1.45   public:
    1.46 -  static const llvm::PointerType* itableOffsetEntry_type() {
    1.47 +  static llvm::PointerType* itableOffsetEntry_type() {
    1.48      return context().itableOffsetEntry_type();
    1.49    }
    1.50 -  static const llvm::PointerType* jniEnv_type() {
    1.51 +  static llvm::PointerType* jniEnv_type() {
    1.52      return context().jniEnv_type();
    1.53    }
    1.54 -  static const llvm::PointerType* jniHandleBlock_type() {
    1.55 +  static llvm::PointerType* jniHandleBlock_type() {
    1.56      return context().jniHandleBlock_type();
    1.57    }
    1.58 -  static const llvm::PointerType* klass_type() {
    1.59 +  static llvm::PointerType* Metadata_type() {
    1.60 +    return context().Metadata_type();
    1.61 +  }
    1.62 +  static llvm::PointerType* klass_type() {
    1.63      return context().klass_type();
    1.64    }
    1.65 -  static const llvm::PointerType* Method*_type() {
    1.66 -    return context().Method*_type();
    1.67 +  static llvm::PointerType* Method_type() {
    1.68 +    return context().Method_type();
    1.69    }
    1.70 -  static const llvm::ArrayType* monitor_type() {
    1.71 +  static llvm::ArrayType* monitor_type() {
    1.72      return context().monitor_type();
    1.73    }
    1.74 -  static const llvm::PointerType* oop_type() {
    1.75 +  static llvm::PointerType* oop_type() {
    1.76      return context().oop_type();
    1.77    }
    1.78 -  static const llvm::PointerType* thread_type() {
    1.79 +  static llvm::PointerType* thread_type() {
    1.80      return context().thread_type();
    1.81    }
    1.82 -  static const llvm::PointerType* zeroStack_type() {
    1.83 +  static llvm::PointerType* zeroStack_type() {
    1.84      return context().zeroStack_type();
    1.85    }
    1.86 -  static const llvm::FunctionType* entry_point_type() {
    1.87 +  static llvm::FunctionType* entry_point_type() {
    1.88      return context().entry_point_type();
    1.89    }
    1.90 -  static const llvm::FunctionType* osr_entry_point_type() {
    1.91 +  static llvm::FunctionType* osr_entry_point_type() {
    1.92      return context().osr_entry_point_type();
    1.93    }
    1.94  
    1.95    // Mappings
    1.96   public:
    1.97 -  static const llvm::Type* to_stackType(BasicType type) {
    1.98 +  static llvm::Type* to_stackType(BasicType type) {
    1.99      return context().to_stackType(type);
   1.100    }
   1.101 -  static const llvm::Type* to_stackType(ciType* type) {
   1.102 +  static llvm::Type* to_stackType(ciType* type) {
   1.103      return to_stackType(type->basic_type());
   1.104    }
   1.105 -  static const llvm::Type* to_arrayType(BasicType type) {
   1.106 +  static llvm::Type* to_arrayType(BasicType type) {
   1.107      return context().to_arrayType(type);
   1.108    }
   1.109 -  static const llvm::Type* to_arrayType(ciType* type) {
   1.110 +  static llvm::Type* to_arrayType(ciType* type) {
   1.111      return to_arrayType(type->basic_type());
   1.112    }
   1.113  };