diff options
| author | Pirama Arumuga Nainar <pirama@google.com> | 2015-04-10 21:38:36 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-10 21:38:36 +0000 |
| commit | 008e1c2ed4d41a5c624da3902a90efd571e89dba (patch) | |
| tree | 8a4b2db8d38f43da2a712fb1293638463954e13a | |
| parent | c75575227d4358adbb213d46510b3a05d4b39daa (diff) | |
| parent | e74f311edda0f0593edbbd71c249f2eaac964ddd (diff) | |
| download | android_frameworks_compile_slang-008e1c2ed4d41a5c624da3902a90efd571e89dba.tar.gz android_frameworks_compile_slang-008e1c2ed4d41a5c624da3902a90efd571e89dba.tar.bz2 android_frameworks_compile_slang-008e1c2ed4d41a5c624da3902a90efd571e89dba.zip | |
am e74f311e: am 748d67a4: Merge "Update slang for LLVM rebase to r233350."
* commit 'e74f311edda0f0593edbbd71c249f2eaac964ddd':
Update slang for LLVM rebase to r233350.
| -rw-r--r-- | slang_backend.cpp | 5 | ||||
| -rw-r--r-- | slang_rs_object_ref_count.cpp | 4 |
2 files changed, 5 insertions, 4 deletions
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 @@ namespace slang { 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::CreateFunctionPasses() { 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 @@ bool Backend::CreateCodeGenPasses() { return true; } else { mCodeGenPasses = new llvm::legacy::FunctionPassManager(mpModule); - mCodeGenPasses->add(new llvm::DataLayoutPass()); } // Create the TargetMachine for generating code. @@ -144,7 +141,7 @@ bool Backend::CreateCodeGenPasses() { // 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 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 @@ static clang::Stmt *ClearStructRSObject( clang::MemberExpr::Create(C, RefRSStruct, false, + clang::SourceLocation(), clang::NestedNameSpecifierLoc(), clang::SourceLocation(), FD, @@ -728,6 +729,7 @@ static clang::Stmt *ClearStructRSObject( clang::MemberExpr::Create(C, RefRSStruct, false, + clang::SourceLocation(), clang::NestedNameSpecifierLoc(), clang::SourceLocation(), FD, @@ -1021,6 +1023,7 @@ static clang::Stmt *CreateStructRSSetObject(clang::ASTContext &C, clang::MemberExpr::Create(C, LHS, false, + clang::SourceLocation(), clang::NestedNameSpecifierLoc(), clang::SourceLocation(), FD, @@ -1035,6 +1038,7 @@ static clang::Stmt *CreateStructRSSetObject(clang::ASTContext &C, clang::MemberExpr::Create(C, RHS, false, + clang::SourceLocation(), clang::NestedNameSpecifierLoc(), clang::SourceLocation(), FD, |