[llvm-commits] CVS: llvm/lib/Debugger/ProgramInfo.cpp

2007-04-08 Thread Reid Spencer 


Changes in directory llvm/lib/Debugger:

ProgramInfo.cpp updated: 1.22 - 1.23
---
Log message:

Make sure temporary data is not used past its life span.


---
Diffs of the changes:  (+2 -2)

 ProgramInfo.cpp |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Index: llvm/lib/Debugger/ProgramInfo.cpp
diff -u llvm/lib/Debugger/ProgramInfo.cpp:1.22 
llvm/lib/Debugger/ProgramInfo.cpp:1.23
--- llvm/lib/Debugger/ProgramInfo.cpp:1.22  Sat Apr  7 13:53:16 2007
+++ llvm/lib/Debugger/ProgramInfo.cpp   Sun Apr  8 15:10:14 2007
@@ -194,8 +194,8 @@
 
 ProgramInfo::ProgramInfo(Module *m) : M(m), ProgramTimeStamp(0,0) {
   assert(M  Cannot create program information with a null module!);
-  const sys::FileStatus *Stat;
-  Stat = sys::PathWithStatus(M-getModuleIdentifier()).getFileStatus();
+  sys::PathWithStatus ModPath(M-getModuleIdentifier());
+  const sys::FileStatus *Stat = ModPath.getFileStatus();
   if (Stat)
 ProgramTimeStamp = Stat-getTimestamp();
 



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits

[llvm-commits] CVS: llvm/lib/Debugger/ProgramInfo.cpp

2007-04-07 Thread Reid Spencer 


Changes in directory llvm/lib/Debugger:

ProgramInfo.cpp updated: 1.21 - 1.22
---
Log message:

For PR1291: http://llvm.org/PR1291 :
Change uses of sys::Path class to sys::PathWithStatus in those places where
the file status information is needed.


---
Diffs of the changes:  (+1 -1)

 ProgramInfo.cpp |2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


Index: llvm/lib/Debugger/ProgramInfo.cpp
diff -u llvm/lib/Debugger/ProgramInfo.cpp:1.21 
llvm/lib/Debugger/ProgramInfo.cpp:1.22
--- llvm/lib/Debugger/ProgramInfo.cpp:1.21  Thu Mar 29 14:05:44 2007
+++ llvm/lib/Debugger/ProgramInfo.cpp   Sat Apr  7 13:53:16 2007
@@ -195,7 +195,7 @@
 ProgramInfo::ProgramInfo(Module *m) : M(m), ProgramTimeStamp(0,0) {
   assert(M  Cannot create program information with a null module!);
   const sys::FileStatus *Stat;
-  Stat = sys::Path(M-getModuleIdentifier()).getFileStatus();
+  Stat = sys::PathWithStatus(M-getModuleIdentifier()).getFileStatus();
   if (Stat)
 ProgramTimeStamp = Stat-getTimestamp();
 



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits

Re: [llvm-commits] CVS: llvm/lib/Debugger/ProgramInfo.cpp

2007-04-07 Thread Jeff Cohen 
This breaks the LLVM build.  I am getting errors like:

llvm[1]: Compiling Archive.cpp for Debug build
/usr/home/jeffc/llvm/lib/Bytecode/Archive/Archive.cpp: In member 
function 'bool llvm::ArchiveMember::replaceWith(const llvm::sys::Path, 
std::string*)':
/usr/home/jeffc/llvm/lib/Bytecode/Archive/Archive.cpp:119: error: 'class 
llvm::sys::Path' has no member named 'getFileStatus'


Reid Spencer wrote:
 Changes in directory llvm/lib/Debugger:

 ProgramInfo.cpp updated: 1.21 - 1.22
 ---
 Log message:

 For PR1291: http://llvm.org/PR1291 :
 Change uses of sys::Path class to sys::PathWithStatus in those places where
 the file status information is needed.


 ---
 Diffs of the changes:  (+1 -1)

  ProgramInfo.cpp |2 +-
  1 files changed, 1 insertion(+), 1 deletion(-)


 Index: llvm/lib/Debugger/ProgramInfo.cpp
 diff -u llvm/lib/Debugger/ProgramInfo.cpp:1.21 
 llvm/lib/Debugger/ProgramInfo.cpp:1.22
 --- llvm/lib/Debugger/ProgramInfo.cpp:1.21Thu Mar 29 14:05:44 2007
 +++ llvm/lib/Debugger/ProgramInfo.cpp Sat Apr  7 13:53:16 2007
 @@ -195,7 +195,7 @@
  ProgramInfo::ProgramInfo(Module *m) : M(m), ProgramTimeStamp(0,0) {
assert(M  Cannot create program information with a null module!);
const sys::FileStatus *Stat;
 -  Stat = sys::Path(M-getModuleIdentifier()).getFileStatus();
 +  Stat = sys::PathWithStatus(M-getModuleIdentifier()).getFileStatus();
if (Stat)
  ProgramTimeStamp = Stat-getTimestamp();
  



 ___
 llvm-commits mailing list
 llvm-commits@cs.uiuc.edu
 http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits



   

___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits

Re: [llvm-commits] CVS: llvm/lib/Debugger/ProgramInfo.cpp

2007-04-07 Thread Reid Spencer 
On Sat, 2007-04-07 at 12:41 -0700, Jeff Cohen wrote:
 This breaks the LLVM build.  I am getting errors like:
 
 llvm[1]: Compiling Archive.cpp for Debug build
 /usr/home/jeffc/llvm/lib/Bytecode/Archive/Archive.cpp: In member 
 function 'bool llvm::ArchiveMember::replaceWith(const llvm::sys::Path, 
 std::string*)':
 /usr/home/jeffc/llvm/lib/Bytecode/Archive/Archive.cpp:119: error: 'class 
 llvm::sys::Path' has no member named 'getFileStatus'

Somehow I missed that one. Not sure how as I did a full recompile.
ANyway, its fixed now. 

You said you had many other issue with compilation? What else?

Reid.

 
 
 Reid Spencer wrote:
  Changes in directory llvm/lib/Debugger:
 
  ProgramInfo.cpp updated: 1.21 - 1.22
  ---
  Log message:
 
  For PR1291: http://llvm.org/PR1291 :
  Change uses of sys::Path class to sys::PathWithStatus in those places where
  the file status information is needed.
 
 
  ---
  Diffs of the changes:  (+1 -1)
 
   ProgramInfo.cpp |2 +-
   1 files changed, 1 insertion(+), 1 deletion(-)
 
 
  Index: llvm/lib/Debugger/ProgramInfo.cpp
  diff -u llvm/lib/Debugger/ProgramInfo.cpp:1.21 
  llvm/lib/Debugger/ProgramInfo.cpp:1.22
  --- llvm/lib/Debugger/ProgramInfo.cpp:1.21  Thu Mar 29 14:05:44 2007
  +++ llvm/lib/Debugger/ProgramInfo.cpp   Sat Apr  7 13:53:16 2007
  @@ -195,7 +195,7 @@
   ProgramInfo::ProgramInfo(Module *m) : M(m), ProgramTimeStamp(0,0) {
 assert(M  Cannot create program information with a null module!);
 const sys::FileStatus *Stat;
  -  Stat = sys::Path(M-getModuleIdentifier()).getFileStatus();
  +  Stat = sys::PathWithStatus(M-getModuleIdentifier()).getFileStatus();
 if (Stat)
   ProgramTimeStamp = Stat-getTimestamp();
   
 
 
 
  ___
  llvm-commits mailing list
  llvm-commits@cs.uiuc.edu
  http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
 
 
 

 
 ___
 llvm-commits mailing list
 llvm-commits@cs.uiuc.edu
 http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits

___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits

Re: [llvm-commits] CVS: llvm/lib/Debugger/ProgramInfo.cpp

2007-04-07 Thread Reid Spencer 
I found some uncommitted things in my tree. Sorry.

They are committed now.

On Sat, 2007-04-07 at 12:41 -0700, Jeff Cohen wrote:
 This breaks the LLVM build.  I am getting errors like:
 
 llvm[1]: Compiling Archive.cpp for Debug build
 /usr/home/jeffc/llvm/lib/Bytecode/Archive/Archive.cpp: In member 
 function 'bool llvm::ArchiveMember::replaceWith(const llvm::sys::Path, 
 std::string*)':
 /usr/home/jeffc/llvm/lib/Bytecode/Archive/Archive.cpp:119: error: 'class 
 llvm::sys::Path' has no member named 'getFileStatus'
 
 
 Reid Spencer wrote:
  Changes in directory llvm/lib/Debugger:
 
  ProgramInfo.cpp updated: 1.21 - 1.22
  ---
  Log message:
 
  For PR1291: http://llvm.org/PR1291 :
  Change uses of sys::Path class to sys::PathWithStatus in those places where
  the file status information is needed.
 
 
  ---
  Diffs of the changes:  (+1 -1)
 
   ProgramInfo.cpp |2 +-
   1 files changed, 1 insertion(+), 1 deletion(-)
 
 
  Index: llvm/lib/Debugger/ProgramInfo.cpp
  diff -u llvm/lib/Debugger/ProgramInfo.cpp:1.21 
  llvm/lib/Debugger/ProgramInfo.cpp:1.22
  --- llvm/lib/Debugger/ProgramInfo.cpp:1.21  Thu Mar 29 14:05:44 2007
  +++ llvm/lib/Debugger/ProgramInfo.cpp   Sat Apr  7 13:53:16 2007
  @@ -195,7 +195,7 @@
   ProgramInfo::ProgramInfo(Module *m) : M(m), ProgramTimeStamp(0,0) {
 assert(M  Cannot create program information with a null module!);
 const sys::FileStatus *Stat;
  -  Stat = sys::Path(M-getModuleIdentifier()).getFileStatus();
  +  Stat = sys::PathWithStatus(M-getModuleIdentifier()).getFileStatus();
 if (Stat)
   ProgramTimeStamp = Stat-getTimestamp();
   
 
 
 
  ___
  llvm-commits mailing list
  llvm-commits@cs.uiuc.edu
  http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
 
 
 

 
 ___
 llvm-commits mailing list
 llvm-commits@cs.uiuc.edu
 http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits

___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits

[llvm-commits] CVS: llvm/lib/Debugger/ProgramInfo.cpp

2007-03-29 Thread Reid Spencer 


Changes in directory llvm/lib/Debugger:

ProgramInfo.cpp updated: 1.20 - 1.21
---
Log message:

For PR789: http://llvm.org/PR789 :
Make the sys::Path::getFileStatus function more efficient by having it
return a pointer to the FileStatus structure rather than copy it. Adjust
uses of the function accordingly. Also, fix some memory issues in sys::Path.


---
Diffs of the changes:  (+4 -3)

 ProgramInfo.cpp |7 ---
 1 files changed, 4 insertions(+), 3 deletions(-)


Index: llvm/lib/Debugger/ProgramInfo.cpp
diff -u llvm/lib/Debugger/ProgramInfo.cpp:1.20 
llvm/lib/Debugger/ProgramInfo.cpp:1.21
--- llvm/lib/Debugger/ProgramInfo.cpp:1.20  Thu Dec  7 14:28:15 2006
+++ llvm/lib/Debugger/ProgramInfo.cpp   Thu Mar 29 14:05:44 2007
@@ -194,9 +194,10 @@
 
 ProgramInfo::ProgramInfo(Module *m) : M(m), ProgramTimeStamp(0,0) {
   assert(M  Cannot create program information with a null module!);
-  sys::FileStatus Stat;
-  if (!sys::Path(M-getModuleIdentifier()).getFileStatus(Stat))
-ProgramTimeStamp = Stat.getTimestamp();
+  const sys::FileStatus *Stat;
+  Stat = sys::Path(M-getModuleIdentifier()).getFileStatus();
+  if (Stat)
+ProgramTimeStamp = Stat-getTimestamp();
 
   SourceFilesIsComplete = false;
   SourceFunctionsIsComplete = false;



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits

[llvm-commits] CVS: llvm/lib/Debugger/ProgramInfo.cpp SourceLanguage-Unknown.cpp

2006-12-07 Thread Bill Wendling 


Changes in directory llvm/lib/Debugger:

ProgramInfo.cpp updated: 1.19 - 1.20
SourceLanguage-Unknown.cpp updated: 1.3 - 1.4
---
Log message:

Removed more iostream includes


---
Diffs of the changes:  (+5 -7)

 ProgramInfo.cpp|6 ++
 SourceLanguage-Unknown.cpp |6 +++---
 2 files changed, 5 insertions(+), 7 deletions(-)


Index: llvm/lib/Debugger/ProgramInfo.cpp
diff -u llvm/lib/Debugger/ProgramInfo.cpp:1.19 
llvm/lib/Debugger/ProgramInfo.cpp:1.20
--- llvm/lib/Debugger/ProgramInfo.cpp:1.19  Thu Nov  2 14:25:49 2006
+++ llvm/lib/Debugger/ProgramInfo.cpp   Thu Dec  7 14:28:15 2006
@@ -23,8 +23,6 @@
 #include llvm/Debugger/SourceLanguage.h
 #include llvm/Support/SlowOperationInformer.h
 #include llvm/ADT/STLExtras.h
-#include iostream
-
 using namespace llvm;
 
 /// getGlobalVariablesUsing - Return all of the global variables which have the
@@ -181,8 +179,8 @@
 if (SD) { // We found the first stop point!
   // This is just a sanity check.
   if (getSourceFile().getDescriptor() != SD)
-std::cout  WARNING: first line of function is not in the
-   file that the function descriptor claims it is in.\n;
+cout  WARNING: first line of function is not in the
+   file that the function descriptor claims it is 
in.\n;
   break;
 }
   }


Index: llvm/lib/Debugger/SourceLanguage-Unknown.cpp
diff -u llvm/lib/Debugger/SourceLanguage-Unknown.cpp:1.3 
llvm/lib/Debugger/SourceLanguage-Unknown.cpp:1.4
--- llvm/lib/Debugger/SourceLanguage-Unknown.cpp:1.3Thu Apr 21 17:36:21 2005
+++ llvm/lib/Debugger/SourceLanguage-Unknown.cppThu Dec  7 14:28:15 2006
@@ -15,7 +15,7 @@
 
 #include llvm/Debugger/SourceLanguage.h
 #include llvm/Debugger/ProgramInfo.h
-#include iostream
+#include llvm/Support/Streams.h
 #include cassert
 using namespace llvm;
 
@@ -131,7 +131,7 @@
   SourceFunctionInfo *Found = IP.first-second;
   ++IP.first;
   if (IP.first != IP.second)
-std::cout  Whoa, found multiple functions with the same name.  I should
-ask the user which one to use: FIXME!\n;
+cout  Whoa, found multiple functions with the same name.  I should
+   ask the user which one to use: FIXME!\n;
   return Found;
 }



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits

[llvm-commits] CVS: llvm/lib/Debugger/ProgramInfo.cpp

2006-11-02 Thread Reid Spencer 


Changes in directory llvm/lib/Debugger:

ProgramInfo.cpp updated: 1.18 - 1.19
---
Log message:

For PR786: http://llvm.org/PR786 :
Turn on -Wunused and -Wno-unused-parameter. Clean up most of the resulting
fall out by removing unused variables. Remaining warnings have to do with
unused functions (I didn't want to delete code without review) and unused
variables in generated code. Maintainers should clean up the remaining 
issues when they see them. All changes pass DejaGnu tests and Olden.


---
Diffs of the changes:  (+1 -1)

 ProgramInfo.cpp |2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


Index: llvm/lib/Debugger/ProgramInfo.cpp
diff -u llvm/lib/Debugger/ProgramInfo.cpp:1.18 
llvm/lib/Debugger/ProgramInfo.cpp:1.19
--- llvm/lib/Debugger/ProgramInfo.cpp:1.18  Fri Oct 20 02:07:24 2006
+++ llvm/lib/Debugger/ProgramInfo.cpp   Thu Nov  2 14:25:49 2006
@@ -61,7 +61,7 @@
   
   // If we found a stop point, check to see if it is earlier than what we
   // already have.  If so, remember it.
-  if (const Function *F = CI-getCalledFunction())
+  if (CI-getCalledFunction())
 if (const DbgStopPointInst *SPI = dyn_castDbgStopPointInst(CI)) {
   unsigned CurLineNo = SPI-getLine();
   unsigned CurColNo = SPI-getColumn();



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits

[llvm-commits] CVS: llvm/lib/Debugger/ProgramInfo.cpp

2006-10-20 Thread Reid Spencer 


Changes in directory llvm/lib/Debugger:

ProgramInfo.cpp updated: 1.17 - 1.18
---
Log message:

For PR950: http://llvm.org/PR950 :
This patch implements the first increment for the Signless Types feature.
All changes pertain to removing the ConstantSInt and ConstantUInt classes
in favor of just using ConstantInt.


---
Diffs of the changes:  (+4 -4)

 ProgramInfo.cpp |8 
 1 files changed, 4 insertions(+), 4 deletions(-)


Index: llvm/lib/Debugger/ProgramInfo.cpp
diff -u llvm/lib/Debugger/ProgramInfo.cpp:1.17 
llvm/lib/Debugger/ProgramInfo.cpp:1.18
--- llvm/lib/Debugger/ProgramInfo.cpp:1.17  Fri Jul 28 17:03:44 2006
+++ llvm/lib/Debugger/ProgramInfo.cpp   Fri Oct 20 02:07:24 2006
@@ -114,8 +114,8 @@
   if (Desc  Desc-hasInitializer())
 if (ConstantStruct *CS = dyn_castConstantStruct(Desc-getInitializer()))
   if (CS-getNumOperands()  4) {
-if (ConstantUInt *CUI = dyn_castConstantUInt(CS-getOperand(1)))
-  Version = CUI-getValue();
+if (ConstantInt *CUI = dyn_castConstantInt(CS-getOperand(1)))
+  Version = CUI-getZExtValue();
 
 BaseName  = CS-getOperand(3)-getStringValue();
 Directory = CS-getOperand(4)-getStringValue();
@@ -237,8 +237,8 @@
   if (Desc  Desc-hasInitializer())
 if (ConstantStruct *CS = dyn_castConstantStruct(Desc-getInitializer()))
   if (CS-getNumOperands()  2)
-if (ConstantUInt *CUI = dyn_castConstantUInt(CS-getOperand(2)))
-  LangID = CUI-getValue();
+if (ConstantInt *CUI = dyn_castConstantInt(CS-getOperand(2)))
+  LangID = CUI-getZExtValue();
 
   const SourceLanguage Lang = SourceLanguage::get(LangID);
   SourceFileInfo *New = Lang.createSourceFileInfo(Desc, *this);



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits

[llvm-commits] CVS: llvm/lib/Debugger/ProgramInfo.cpp

2006-07-28 Thread Chris Lattner 


Changes in directory llvm/lib/Debugger:

ProgramInfo.cpp updated: 1.16 - 1.17
---
Log message:

Change Path::getStatusInfo to return a boolean and error string on an error
instead of throwing an exception.  This reduces the amount of code that is
exposed to exceptions (e.g. FileUtilities), though it is clearly only one step
along the way.


---
Diffs of the changes:  (+3 -2)

 ProgramInfo.cpp |5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)


Index: llvm/lib/Debugger/ProgramInfo.cpp
diff -u llvm/lib/Debugger/ProgramInfo.cpp:1.16 
llvm/lib/Debugger/ProgramInfo.cpp:1.17
--- llvm/lib/Debugger/ProgramInfo.cpp:1.16  Thu Jul  6 17:34:06 2006
+++ llvm/lib/Debugger/ProgramInfo.cpp   Fri Jul 28 17:03:44 2006
@@ -196,8 +196,9 @@
 
 ProgramInfo::ProgramInfo(Module *m) : M(m), ProgramTimeStamp(0,0) {
   assert(M  Cannot create program information with a null module!);
-  sys::Path modulePath(M-getModuleIdentifier());
-  ProgramTimeStamp = modulePath.getTimestamp();
+  sys::FileStatus Stat;
+  if (!sys::Path(M-getModuleIdentifier()).getFileStatus(Stat))
+ProgramTimeStamp = Stat.getTimestamp();
 
   SourceFilesIsComplete = false;
   SourceFunctionsIsComplete = false;



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits

[llvm-commits] CVS: llvm/lib/Debugger/ProgramInfo.cpp

2006-07-06 Thread Chris Lattner 


Changes in directory llvm/lib/Debugger:

ProgramInfo.cpp updated: 1.15 - 1.16
---
Log message:

Modify the SlowOperationInformer interface to not throw exceptions.


---
Diffs of the changes:  (+4 -2)

 ProgramInfo.cpp |6 --
 1 files changed, 4 insertions(+), 2 deletions(-)


Index: llvm/lib/Debugger/ProgramInfo.cpp
diff -u llvm/lib/Debugger/ProgramInfo.cpp:1.15 
llvm/lib/Debugger/ProgramInfo.cpp:1.16
--- llvm/lib/Debugger/ProgramInfo.cpp:1.15  Thu Mar 23 12:06:46 2006
+++ llvm/lib/Debugger/ProgramInfo.cpp   Thu Jul  6 17:34:06 2006
@@ -280,7 +280,8 @@
   // mapping.
   for (unsigned i = 0, e = TranslationUnits.size(); i != e; ++i) {
 getSourceFile(TranslationUnits[i]);
-SOI.progress(i+1, e);
+if (SOI.progress(i+1, e))
+  throw While building source files index, operation cancelled.;
   }
 
   // Ok, if we got this far, then we indexed the whole program.
@@ -361,7 +362,8 @@
   // Loop over all of the functions found, building the SourceFunctions 
mapping.
   for (unsigned i = 0, e = Functions.size(); i != e; ++i) {
 getFunction(Functions[i]);
-SOI.progress(i+1, e);
+if (SOI.progress(i+1, e))
+  throw While functions index, operation cancelled.;
   }
 
   // Ok, if we got this far, then we indexed the whole program.



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits

[llvm-commits] CVS: llvm/lib/Debugger/ProgramInfo.cpp

2006-03-08 Thread Jim Laskey 


Changes in directory llvm/lib/Debugger:

ProgramInfo.cpp updated: 1.12 - 1.13
---
Log message:

Get rid of the multiple copies of getStringValue.  Now a Constant:: method.


---
Diffs of the changes:  (+3 -42)

 ProgramInfo.cpp |   45 +++--
 1 files changed, 3 insertions(+), 42 deletions(-)


Index: llvm/lib/Debugger/ProgramInfo.cpp
diff -u llvm/lib/Debugger/ProgramInfo.cpp:1.12 
llvm/lib/Debugger/ProgramInfo.cpp:1.13
--- llvm/lib/Debugger/ProgramInfo.cpp:1.12  Thu Jul  7 18:21:43 2005
+++ llvm/lib/Debugger/ProgramInfo.cpp   Wed Mar  8 12:11:07 2006
@@ -38,45 +38,6 @@
   }
 }
 
-/// getStringValue - Turn an LLVM constant pointer that eventually points to a
-/// global into a string value.  Return an empty string if we can't do it.
-///
-static std::string getStringValue(Value *V, unsigned Offset = 0) {
-  if (GlobalVariable *GV = dyn_castGlobalVariable(V)) {
-if (GV-hasInitializer()  isaConstantArray(GV-getInitializer())) {
-  ConstantArray *Init = castConstantArray(GV-getInitializer());
-  if (Init-isString()) {
-std::string Result = Init-getAsString();
-if (Offset  Result.size()) {
-  // If we are pointing INTO The string, erase the beginning...
-  Result.erase(Result.begin(), Result.begin()+Offset);
-
-  // Take off the null terminator, and any string fragments after it.
-  std::string::size_type NullPos = Result.find_first_of((char)0);
-  if (NullPos != std::string::npos)
-Result.erase(Result.begin()+NullPos, Result.end());
-  return Result;
-}
-  }
-}
-  } else if (Constant *C = dyn_castConstant(V)) {
-if (GlobalValue *GV = dyn_castGlobalValue(C))
-  return getStringValue(GV, Offset);
-else if (ConstantExpr *CE = dyn_castConstantExpr(C)) {
-  if (CE-getOpcode() == Instruction::GetElementPtr) {
-// Turn a gep into the specified offset.
-if (CE-getNumOperands() == 3 
-castConstant(CE-getOperand(1))-isNullValue() 
-isaConstantInt(CE-getOperand(2))) {
-  return getStringValue(CE-getOperand(0),
-   Offset+castConstantInt(CE-getOperand(2))-getRawValue());
-}
-  }
-}
-  }
-  return ;
-}
-
 /// getNextStopPoint - Follow the def-use chains of the specified LLVM value,
 /// traversing the use chains until we get to a stoppoint.  When we do, return
 /// the source location of the stoppoint.  If we don't find a stoppoint, return
@@ -158,8 +119,8 @@
 if (ConstantUInt *CUI = dyn_castConstantUInt(CS-getOperand(1)))
   Version = CUI-getValue();
 
-BaseName  = getStringValue(CS-getOperand(3));
-Directory = getStringValue(CS-getOperand(4));
+BaseName  = CS-getOperand(3)-getStringValue();
+Directory = CS-getOperand(4)-getStringValue();
   }
 }
 
@@ -199,7 +160,7 @@
   SourceFile = PI.getSourceFile(GV);
 
 // Entry #2 is the function name.
-Name = getStringValue(CS-getOperand(2));
+Name = CS-getOperand(2)-getStringValue();
   }
 }
 



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits