Parse the %*# constraint modifiers

[oota-llvm.git] / lib / Debugger / ProgramInfo.cpp

diff --git a/lib/Debugger/ProgramInfo.cpp b/lib/Debugger/ProgramInfo.cpp
index d6a4532b4f5997be72219b0b809fcf36f171b118..b55606bd64d8f97f2416942e7d363728f84460cd 100644 (file)
--- a/lib/Debugger/ProgramInfo.cpp
+++ b/lib/Debugger/ProgramInfo.cpp
@@ -1,12 +1,12 @@
 //===-- ProgramInfo.cpp - Compute and cache info about a program ----------===//
-// 
+//
 //                     The LLVM Compiler Infrastructure
 //
 // This file was developed by the LLVM research group and is distributed under
 // the University of Illinois Open Source License. See LICENSE.TXT for details.
-// 
+//
 //===----------------------------------------------------------------------===//
-// 
+//
 // This file implements the ProgramInfo and related classes, by sorting through
 // the loaded Module.
 //
@@ -20,7 +20,6 @@
 #include "llvm/Module.h"
 #include "llvm/Debugger/SourceFile.h"
 #include "llvm/Debugger/SourceLanguage.h"
-#include "llvm/Support/FileUtilities.h"
 #include "llvm/Support/SlowOperationInformer.h"
 #include "llvm/ADT/STLExtras.h"
 #include <iostream>
@@ -108,13 +107,13 @@ static const GlobalVariable *getNextStopPoint(const Value *V, unsigned &LineNo,
           if (const ConstantInt *C = dyn_cast<ConstantInt>(CI->getOperand(3)))
             CurColNo = C->getRawValue();
           const Value *Op = CI->getOperand(4);
-          
+
           if ((CurDesc = dyn_cast<GlobalVariable>(Op)) &&
               (LineNo < LastLineNo ||
                (LineNo == LastLineNo && ColNo < LastColNo))) {
             LastDesc = CurDesc;
             LastLineNo = CurLineNo;
-            LastColNo = CurColNo;            
+            LastColNo = CurColNo;
           }
           ShouldRecurse = false;
         }
@@ -129,12 +128,12 @@ static const GlobalVariable *getNextStopPoint(const Value *V, unsigned &LineNo,
         if (LineNo < LastLineNo || (LineNo == LastLineNo && ColNo < LastColNo)){
           LastDesc = GV;
           LastLineNo = CurLineNo;
-          LastColNo = CurColNo;            
+          LastColNo = CurColNo;
         }
       }
     }
   }
-  
+
   if (LastDesc) {
     LineNo = LastLineNo != ~0U ? LastLineNo : 0;
     ColNo  = LastColNo  != ~0U ? LastColNo : 0;
@@ -158,7 +157,7 @@ SourceFileInfo::SourceFileInfo(const GlobalVariable *Desc,
       if (CS->getNumOperands() > 4) {
         if (ConstantUInt *CUI = dyn_cast<ConstantUInt>(CS->getOperand(1)))
           Version = CUI->getValue();
-        
+
         BaseName  = getStringValue(CS->getOperand(3));
         Directory = getStringValue(CS->getOperand(4));
       }
@@ -170,11 +169,16 @@ SourceFileInfo::~SourceFileInfo() {
 
 SourceFile &SourceFileInfo::getSourceText() const {
   // FIXME: this should take into account the source search directories!
-  if (SourceText == 0)  // Read the file in if we haven't already.
-    if (!Directory.empty() && FileOpenable(Directory+"/"+BaseName))
-      SourceText = new SourceFile(Directory+"/"+BaseName, Descriptor);
+  if (SourceText == 0) { // Read the file in if we haven't already.
+    sys::Path tmpPath;
+    if (!Directory.empty())
+      tmpPath.set(Directory);
+    tmpPath.appendComponent(BaseName);
+    if (tmpPath.canRead())
+      SourceText = new SourceFile(tmpPath.toString(), Descriptor);
     else
       SourceText = new SourceFile(BaseName, Descriptor);
+  }
   return *SourceText;
 }
 
@@ -190,7 +194,7 @@ SourceFunctionInfo::SourceFunctionInfo(ProgramInfo &PI,
     if (ConstantStruct *CS = dyn_cast<ConstantStruct>(Desc->getInitializer()))
       if (CS->getNumOperands() > 2) {
         // Entry #1 is the file descriptor.
-        if (const GlobalVariable *GV = 
+        if (const GlobalVariable *GV =
             dyn_cast<GlobalVariable>(CS->getOperand(1)))
           SourceFile = &PI.getSourceFile(GV);
 
@@ -231,9 +235,10 @@ void SourceFunctionInfo::getSourceLocation(unsigned &RetLineNo,
 // ProgramInfo implementation
 //
 
-ProgramInfo::ProgramInfo(Module *m) : M(m) {
+ProgramInfo::ProgramInfo(Module *m) : M(m), ProgramTimeStamp(0,0) {
   assert(M && "Cannot create program information with a null module!");
-  ProgramTimeStamp = getFileTimestamp(M->getModuleIdentifier());
+  sys::Path modulePath(M->getModuleIdentifier());
+  ProgramTimeStamp = modulePath.getTimestamp();
 
   SourceFilesIsComplete = false;
   SourceFunctionsIsComplete = false;
@@ -333,7 +338,7 @@ const SourceFileInfo &ProgramInfo::getSourceFile(const std::string &Filename) {
   std::multimap<std::string, SourceFileInfo*>::const_iterator Start, End;
   getSourceFiles();
   tie(Start, End) = SourceFileIndex.equal_range(Filename);
-  
+
   if (Start == End) throw "Could not find source file '" + Filename + "'!";
   const SourceFileInfo &SFI = *Start->second;
   ++Start;