Add support to emit debug info for C++ namespaces.

[oota-llvm.git] / lib / System / Path.cpp

diff --git a/lib/System/Path.cpp b/lib/System/Path.cpp
index baaa310214b98f19d35cd19e8a931c55bd9e6399..8e1fa538b7b7e80bcb9aae7ae1eb9a3df6c8a6c9 100644 (file)
--- a/lib/System/Path.cpp
+++ b/lib/System/Path.cpp
@@ -28,19 +28,10 @@ bool Path::operator==(const Path &that) const {
   return path == that.path;
 }
 
-bool Path::operator!=(const Path &that) const {
-  return path != that.path;
-}
-
 bool Path::operator<(const Path& that) const {
   return path < that.path;
 }
 
-std::ostream& llvm::operator<<(std::ostream &strm, const sys::Path &aPath) {
-  strm << aPath.toString();
-  return strm;
-}
-
 Path
 Path::GetLLVMConfigDir() {
   Path result;
@@ -52,10 +43,15 @@ Path::GetLLVMConfigDir() {
 }
 
 LLVMFileType
-sys::IdentifyFileType(const char*magic, unsigned length) {
+sys::IdentifyFileType(const char *magic, unsigned length) {
   assert(magic && "Invalid magic number string");
   assert(length >=4 && "Invalid magic number length");
-  switch (magic[0]) {
+  switch ((unsigned char)magic[0]) {
+    case 0xDE:  // 0x0B17C0DE = BC wraper
+      if (magic[1] == (char)0xC0 && magic[2] == (char)0x17 &&
+          magic[3] == (char)0x0B)
+        return Bitcode_FileType;
+      break;
     case 'B':
       if (magic[1] == 'C' && magic[2] == (char)0xC0 && magic[3] == (char)0xDE)
         return Bitcode_FileType;
@@ -91,8 +87,8 @@ sys::IdentifyFileType(const char*magic, unsigned length) {
       break;
 
     case 0xFE:
-    case 0xCE:
-      uint16_t type;
+    case 0xCE: {
+      uint16_t type = 0;
       if (magic[0] == char(0xFE) && magic[1] == char(0xED) && 
           magic[2] == char(0xFA) && magic[3] == char(0xCE)) {
         /* Native endian */
@@ -101,7 +97,7 @@ sys::IdentifyFileType(const char*magic, unsigned length) {
                  magic[2] == char(0xED) && magic[3] == char(0xFE)) {
         /* Reverse endian */
         if (length >= 14) type = magic[13] << 8 | magic[12];
-      } 
+      }
       switch (type) {
         default: break;      
         case 1: return Mach_O_Object_FileType; 
@@ -116,7 +112,7 @@ sys::IdentifyFileType(const char*magic, unsigned length) {
         case 10: break; // FIXME: MH_DSYM companion file with only debug.
       }
       break;
-
+    }
     case 0xF0: // PowerPC Windows
     case 0x83: // Alpha 32-bit
     case 0x84: // Alpha 64-bit
@@ -189,7 +185,10 @@ Path::isBitcodeFile() const {
   std::string actualMagic;
   if (!getMagicNumber(actualMagic, 4))
     return false;
-  return actualMagic == "BC\xC0\xDE";
+  LLVMFileType FT =
+    IdentifyFileType(actualMagic.c_str(),
+                     static_cast<unsigned>(actualMagic.length()));
+  return FT == Bitcode_FileType;
 }
 
 bool Path::hasMagicNumber(const std::string &Magic) const {