commit 706e7dbb0dc15e809c2e2346b3bc4927bc1290cd
author TDYa127 <tdy@google.com> Sun May 06 00:05:33 2012 -0700
committer Shih-wei Liao <sliao@google.com> Sun May 06 15:02:05 2012 -0700
tree 0f48cc61b80e401edd88b114f00d23ab8fbb7551
parent 8ca100552be43ed11351a27497e3581abb055311

TBAA, separate different types of heap load/store.

Change-Id: I24dc2857db2985239e17d97fdd6463d7f2b54985

src/compiler_llvm/tbaa_info.cc

diff --git a/src/compiler_llvm/tbaa_info.cc b/src/compiler_llvm/tbaa_info.cc
index 01a1978..d1b351f 100644
--- a/src/compiler_llvm/tbaa_info.cc
+++ b/src/compiler_llvm/tbaa_info.cc
@@ -42,15 +42,14 @@
   llvm::MDNode*& spec_ty = special_type_[sty_id];
   if (spec_ty == NULL) {
     switch (sty_id) {
-    case kTBAARegister:         spec_ty = GenTBAANode("Register", GetRootType()); break;
-    case kTBAAStackTemp:        spec_ty = GenTBAANode("StackTemp", GetRootType()); break;
-    case kTBAAMemory:           spec_ty = GenTBAANode("Memory", GetRootType()); break;
-    case kTBAAMemoryArray:      spec_ty = GenTBAANode("MemoryArray", GetRootType()); break;
-    case kTBAAMemoryIdentified: spec_ty = GenTBAANode("MemoryIdentified", GetRootType()); break;
-    case kTBAAMemoryStatic:     spec_ty = GenTBAANode("MemoryStatic", GetRootType()); break;
-    case kTBAAJRuntime:         spec_ty = GenTBAANode("JRuntime", GetRootType()); break;
-    case kTBAARuntimeInfo:      spec_ty = GenTBAANode("RuntimeInfo", GetRootType()); break;
-    case kTBAAConstJObject:     spec_ty = GenTBAANode("ConstJObject", GetRootType(), true); break;
+    case kTBAARegister:     spec_ty = GenTBAANode("Register", GetRootType()); break;
+    case kTBAAStackTemp:    spec_ty = GenTBAANode("StackTemp", GetRootType()); break;
+    case kTBAAHeapArray:    spec_ty = GenTBAANode("HeapArray", GetRootType()); break;
+    case kTBAAHeapInstance: spec_ty = GenTBAANode("HeapInstance", GetRootType()); break;
+    case kTBAAHeapStatic:   spec_ty = GenTBAANode("HeapStatic", GetRootType()); break;
+    case kTBAAJRuntime:     spec_ty = GenTBAANode("JRuntime", GetRootType()); break;
+    case kTBAARuntimeInfo:  spec_ty = GenTBAANode("RuntimeInfo", GetRootType()); break;
+    case kTBAAConstJObject: spec_ty = GenTBAANode("ConstJObject", GetRootType(), true); break;
     default:
       LOG(FATAL) << "Unknown TBAA special type: " << sty_id;
       break;
@@ -59,6 +58,50 @@
   return spec_ty;
 }
 
+llvm::MDNode* TBAAInfo::GetMemoryJType(TBAASpecialType sty_id, JType jty_id) {
+  DCHECK(sty_id == kTBAAHeapArray ||
+         sty_id == kTBAAHeapInstance ||
+         sty_id == kTBAAHeapStatic) << "SpecialType must be array, identified, or static";
+
+  DCHECK_GE(jty_id, 0) << "Unknown JType: " << jty_id;
+  DCHECK_LT(jty_id, MAX_JTYPE) << "Unknown JType: " << jty_id;
+  DCHECK_NE(jty_id, kVoid) << "Can't load/store Void type!";
+
+  std::string name;
+  size_t sty_mapped_index = 0;
+  switch (sty_id) {
+  case kTBAAHeapArray:    sty_mapped_index = 0; name = "HeapArray "; break;
+  case kTBAAHeapInstance: sty_mapped_index = 1; name = "HeapInstance "; break;
+  case kTBAAHeapStatic:   sty_mapped_index = 2; name = "HeapStatic "; break;
+  default:
+    LOG(FATAL) << "Unknown TBAA special type: " << sty_id;
+    break;
+  }
+
+  llvm::MDNode*& spec_ty = memory_jtype_[sty_mapped_index][jty_id];
+  if (spec_ty != NULL) {
+    return spec_ty;
+  }
+
+  switch (jty_id) {
+  case kBoolean: name += "Boolean"; break;
+  case kByte:    name += "Byte"; break;
+  case kChar:    name += "Char"; break;
+  case kShort:   name += "Short"; break;
+  case kInt:     name += "Int"; break;
+  case kLong:    name += "Long"; break;
+  case kFloat:   name += "Float"; break;
+  case kDouble:  name += "Double"; break;
+  case kObject:  name += "Object"; break;
+  default:
+    LOG(FATAL) << "Unknown JType: " << jty_id;
+    break;
+  }
+
+  spec_ty = GenTBAANode(name, GetSpecialType(sty_id));
+  return spec_ty;
+}
+
 llvm::MDNode* TBAAInfo::GenTBAANode(llvm::StringRef name, llvm::MDNode* parent, bool read_only) {
   llvm::SmallVector<llvm::Value*, 3> array_ref;