Updated to a recent LLVM and Clang revision.

mono · Mar 13, 2014 · fb70229 · fb70229 · tritao · Mar 13, 2014
1 parent b6d4a24
commit fb70229
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 27 deletions.
diff --git a/docs/GettingStarted.md b/docs/GettingStarted.md
@@ -25,12 +25,10 @@ Git repository urls found here: [http://llvm.org/docs/GettingStarted.html#git-mi
 Building in *Release* is recommended because else the Clang parser will be
 excruciatingly slow.
 
-Last updated to LLVM/Clang revision: `r198449`
+Last updated to LLVM/Clang revision: `r202563`
 
 ## Compiling on Mac OS X (experimental)
 
-Requirements: Clang revision >= 198625
-
 1. Clone CppSharp to `<CppSharp>`
 2. Clone LLVM to `<CppSharp>\deps\llvm`
 3. Clone Clang to `<CppSharp>\deps\llvm\tools\clang`

diff --git a/src/CppParser/Parser.cpp b/src/CppParser/Parser.cpp
@@ -8,6 +8,7 @@
 #include "Parser.h"
 
 #include <llvm/Support/Path.h>
+#include <llvm/Support/raw_ostream.h>
 #include <llvm/Object/Archive.h>
 #include <llvm/Object/ObjectFile.h>
 #include <llvm/IR/LLVMContext.h>
@@ -507,11 +508,10 @@ void Parser::WalkVTable(clang::CXXRecordDecl* RD, Class* C)
             auto& VFPtrInfo = *I;
 
             VFTableInfo Info;
-            Info.VBTableIndex = VFPtrInfo.VBTableIndex;
-            Info.VFPtrOffset = VFPtrInfo.VFPtrOffset.getQuantity();
-            Info.VFPtrFullOffset = VFPtrInfo.VFPtrFullOffset.getQuantity();
+            Info.VFPtrOffset = VFPtrInfo->NonVirtualOffset.getQuantity();
+            Info.VFPtrFullOffset = VFPtrInfo->FullOffsetInMDC.getQuantity();
 
-            auto& VTLayout = VTContext.getVFTableLayout(RD, VFPtrInfo.VFPtrFullOffset);
+            auto& VTLayout = VTContext.getVFTableLayout(RD, VFPtrInfo->FullOffsetInMDC);
             Info.Layout = WalkVTableLayout(VTLayout);
 
             C->Layout.VFTables.push_back(Info);
@@ -2632,23 +2632,25 @@ ParserResultKind Parser::ParseSharedLib(llvm::StringRef File,
     for(auto it = Object.get()->symbol_begin(); it != Object.get()->symbol_end();
         ++it)
     {
-        llvm::StringRef SymRef;
-
-        if (it->getName(SymRef))
-            continue;
+        std::string Sym;
+        llvm::raw_string_ostream SymStream(Sym);
+
+        if (it->printName(SymStream))
+             continue;
 
-        NativeLib->Symbols.push_back(SymRef);
+        NativeLib->Symbols.push_back(Sym);
     }
 
     for (auto it = Object.get()->symbol_begin(); it != Object.get()->symbol_end();
         ++it)
     {
-        llvm::StringRef SymRef;
-
-        if (it->getName(SymRef))
-            continue;
+        std::string Sym;
+        llvm::raw_string_ostream SymStream(Sym);
+
+        if (it->printName(SymStream))
+             continue;
 
-        NativeLib->Symbols.push_back(SymRef);
+        NativeLib->Symbols.push_back(Sym);
     }
 
     return ParserResultKind::Success;

diff --git a/src/Parser/Parser.cpp b/src/Parser/Parser.cpp
@@ -9,6 +9,7 @@
 #include "Interop.h"
 
 #include <llvm/Support/Path.h>
+#include <llvm/Support/raw_ostream.h>
 #include <llvm/Object/Archive.h>
 #include <llvm/Object/ObjectFile.h>
 #include <llvm/IR/LLVMContext.h>
@@ -508,11 +509,10 @@ void Parser::WalkVTable(clang::CXXRecordDecl* RD, CppSharp::AST::Class^ C)
             auto& VFPtrInfo = *I;
 
             CppSharp::AST::VFTableInfo Info;
-            Info.VBTableIndex = VFPtrInfo.VBTableIndex;
-            Info.VFPtrOffset = VFPtrInfo.VFPtrOffset.getQuantity();
-            Info.VFPtrFullOffset = VFPtrInfo.VFPtrFullOffset.getQuantity();
+            Info.VFPtrOffset = VFPtrInfo->NonVirtualOffset.getQuantity();
+            Info.VFPtrFullOffset = VFPtrInfo->FullOffsetInMDC.getQuantity();
 
-            auto& VTLayout = VTContext.getVFTableLayout(RD, VFPtrInfo.VFPtrFullOffset);
+            auto& VTLayout = VTContext.getVFTableLayout(RD, VFPtrInfo->FullOffsetInMDC);
             Info.Layout = WalkVTableLayout(VTLayout);
 
             C->Layout->VFTables->Add(Info);
@@ -2644,24 +2644,26 @@ ParserResultKind Parser::ParseSharedLib(llvm::StringRef File,
     for(auto it = Object.get()->symbol_begin(); it != Object.get()->symbol_end();
         ++it)
     {
-        llvm::StringRef SymRef;
+        std::string Sym;
+        llvm::raw_string_ostream SymStream(Sym);
 
-        if (it->getName(SymRef))
+        if (it->printName(SymStream))
             continue;
 
-        System::String^ SymName = clix::marshalString<clix::E_UTF8>(SymRef);
+        System::String^ SymName = clix::marshalString<clix::E_UTF8>(Sym);
         NativeLib->Symbols->Add(SymName);
     }
 
     for(auto it = Object.get()->symbol_begin(); it != Object.get()->symbol_end();
         ++it)
     {
-        llvm::StringRef SymRef;
+        std::string Sym;
+        llvm::raw_string_ostream SymStream(Sym);
 
-        if (it->getName(SymRef))
+        if (it->printName(SymStream))
             continue;
 
-        System::String^ SymName = clix::marshalString<clix::E_UTF8>(SymRef);
+        System::String^ SymName = clix::marshalString<clix::E_UTF8>(Sym);
         NativeLib->Symbols->Add(SymName);
     }