From 3f0a0686a816b3b3ec2a3693e9652888e4dc1332 Mon Sep 17 00:00:00 2001
From: Benjamin Kramer <benny.kra@gmail.com>
Date: Thu, 23 Jul 2009 20:34:35 +0200
Subject: [PATCH] Value::getNameStart and Value::getNameLength were removed

---
 gen/passes/GarbageCollect2Stack.cpp  | 7 +++----
 gen/passes/SimplifyDRuntimeCalls.cpp | 3 +--
 gen/passes/StripMetaData.cpp         | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/gen/passes/GarbageCollect2Stack.cpp b/gen/passes/GarbageCollect2Stack.cpp
index fbbf6ff5..eb37b63c 100644
--- a/gen/passes/GarbageCollect2Stack.cpp
+++ b/gen/passes/GarbageCollect2Stack.cpp
@@ -203,7 +203,7 @@ namespace {
                 return false;
             
             std::string metaname = CD_PREFIX;
-            metaname.append(ClassInfo->getNameStart(), ClassInfo->getNameEnd());
+            metaname += ClassInfo->getName();
             
             GlobalVariable* global = A.M.getGlobalVariable(metaname);
             if (!global || !global->hasInitializer())
@@ -348,9 +348,8 @@ bool GarbageCollect2Stack::runOnFunction(Function &F) {
                 continue;
             
             // Ignore unknown calls.
-            const char *CalleeName = Callee->getNameStart();
             StringMap<FunctionInfo*>::iterator OMI =
-                KnownFunctions.find(CalleeName, CalleeName+Callee->getNameLen());
+                KnownFunctions.find(Callee->getName());
             if (OMI == KnownFunctions.end()) continue;
             
             assert(isa<PointerType>(Inst->getType())
@@ -397,7 +396,7 @@ const Type* Analysis::getTypeFor(Value* typeinfo) const {
         return NULL;
     
     std::string metaname = TD_PREFIX;
-    metaname.append(ti_global->getNameStart(), ti_global->getNameEnd());
+    metaname += ti_global->getName();
     
     GlobalVariable* global = M.getGlobalVariable(metaname);
     if (!global || !global->hasInitializer())
diff --git a/gen/passes/SimplifyDRuntimeCalls.cpp b/gen/passes/SimplifyDRuntimeCalls.cpp
index bd794f1d..324e5d8b 100644
--- a/gen/passes/SimplifyDRuntimeCalls.cpp
+++ b/gen/passes/SimplifyDRuntimeCalls.cpp
@@ -375,9 +375,8 @@ bool SimplifyDRuntimeCalls::runOnce(Function &F, const TargetData& TD, AliasAnal
                 continue;
             
             // Ignore unknown calls.
-            const char *CalleeName = Callee->getNameStart();
             StringMap<LibCallOptimization*>::iterator OMI =
-                Optimizations.find(CalleeName, CalleeName+Callee->getNameLen());
+                Optimizations.find(Callee->getName());
             if (OMI == Optimizations.end()) continue;
             
             DEBUG(errs() << "SimplifyDRuntimeCalls inspecting: " << *CI);
diff --git a/gen/passes/StripMetaData.cpp b/gen/passes/StripMetaData.cpp
index e2aaa372..f6b95f61 100644
--- a/gen/passes/StripMetaData.cpp
+++ b/gen/passes/StripMetaData.cpp
@@ -64,7 +64,7 @@ bool StripMetaData::runOnModule(Module &M) {
     bool Changed = false;
     for (Module::global_iterator I = M.global_begin(), E = M.global_end(); I != E;) {
         GlobalVariable* G = I++;
-        if (G->getNameLen() >= 9 && !strncmp(G->getNameStart(), "llvm.ldc.", 9)) {
+        if (G->getName().startswith("llvm.ldc.")) {
             assert(G->hasInitializer() && isa<MDNode>(G->getInitializer())
                 && "Not a metadata global?");
             Changed = true;