commit 0b7545898dcfe2979f2c13afd12d276fc736412d
author Stephen Hines <srhines@google.com> Tue Apr 07 13:59:57 2015 -0700
committer Stephen Hines <srhines@google.com> Tue Apr 07 13:59:57 2015 -0700
tree 8a4b2db8d38f43da2a712fb1293638463954e13a
parent 91eae4ae72f5f8ed251c270082abb0d18a2922c5

Update slang for LLVM rebase to r233350.

Change-Id: I1883757eb9987e45892ae6efde80f825fc9b5367

slang_backend.cpp

diff --git a/slang_backend.cpp b/slang_backend.cpp
index 6aa082c..9ed1a88 100644
--- a/slang_backend.cpp
+++ b/slang_backend.cpp
@@ -65,7 +65,6 @@
 void Backend::CreateFunctionPasses() {
   if (!mPerFunctionPasses) {
     mPerFunctionPasses = new llvm::legacy::FunctionPassManager(mpModule);
-    mPerFunctionPasses->add(new llvm::DataLayoutPass());
 
     llvm::PassManagerBuilder PMBuilder;
     PMBuilder.OptLevel = mCodeGenOpts.OptimizationLevel;
@@ -76,7 +75,6 @@
 void Backend::CreateModulePasses() {
   if (!mPerModulePasses) {
     mPerModulePasses = new llvm::legacy::PassManager();
-    mPerModulePasses->add(new llvm::DataLayoutPass());
 
     llvm::PassManagerBuilder PMBuilder;
     PMBuilder.OptLevel = mCodeGenOpts.OptimizationLevel;
@@ -108,7 +106,6 @@
     return true;
   } else {
     mCodeGenPasses = new llvm::legacy::FunctionPassManager(mpModule);
-    mCodeGenPasses->add(new llvm::DataLayoutPass());
   }
 
   // Create the TargetMachine for generating code.
@@ -144,7 +141,7 @@
   // This is set for the linker (specify how large of the virtual addresses we
   // can access for all unknown symbols.)
   llvm::CodeModel::Model CM;
-  if (mpModule->getDataLayout()->getPointerSize() == 4) {
+  if (mpModule->getDataLayout().getPointerSize() == 4) {
     CM = llvm::CodeModel::Small;
   } else {
     // The target may have pointer size greater than 32 (e.g. x86_64

slang_rs_object_ref_count.cpp

diff --git a/slang_rs_object_ref_count.cpp b/slang_rs_object_ref_count.cpp
index 47db22f..05722a2 100644
--- a/slang_rs_object_ref_count.cpp
+++ b/slang_rs_object_ref_count.cpp
@@ -695,6 +695,7 @@
           clang::MemberExpr::Create(C,
                                     RefRSStruct,
                                     false,
+                                    clang::SourceLocation(),
                                     clang::NestedNameSpecifierLoc(),
                                     clang::SourceLocation(),
                                     FD,
@@ -728,6 +729,7 @@
           clang::MemberExpr::Create(C,
                                     RefRSStruct,
                                     false,
+                                    clang::SourceLocation(),
                                     clang::NestedNameSpecifierLoc(),
                                     clang::SourceLocation(),
                                     FD,
@@ -1021,6 +1023,7 @@
         clang::MemberExpr::Create(C,
                                   LHS,
                                   false,
+                                  clang::SourceLocation(),
                                   clang::NestedNameSpecifierLoc(),
                                   clang::SourceLocation(),
                                   FD,
@@ -1035,6 +1038,7 @@
         clang::MemberExpr::Create(C,
                                   RHS,
                                   false,
+                                  clang::SourceLocation(),
                                   clang::NestedNameSpecifierLoc(),
                                   clang::SourceLocation(),
                                   FD,