Adapt llvm-rs-cc for LLVM/Clang update.

Change-Id: Ic38ebc1d824f6d3ae26c6b354336a01b52d46136

4 files changed, 8 insertions, 5 deletions

diff --git a/slang.cpp b/slang.cpp
index dd19496..d22256b 100644
--- a/slang.cpp
+++ b/slang.cpp
@@ -165,7 +165,8 @@ void Slang::GlobalInitialization() {
   }
 }
 
-void Slang::LLVMErrorHandler(void *UserData, const std::string &Message) {
+void Slang::LLVMErrorHandler(void *UserData, const std::string &Message,
+                             bool GenCrashDialog) {
   clang::DiagnosticsEngine* DiagEngine =
     static_cast<clang::DiagnosticsEngine *>(UserData);
 
diff --git a/slang.h b/slang.h
index c33f5c8..a60c5c7 100644
--- a/slang.h
+++ b/slang.h
@@ -63,7 +63,8 @@ class Slang : public clang::ModuleLoader {
 
   static bool GlobalInitialized;
 
-  static void LLVMErrorHandler(void *UserData, const std::string &Message);
+  static void LLVMErrorHandler(void *UserData, const std::string &Message,
+                               bool GenCrashDialog);
 
  public:
   enum OutputType {
diff --git a/slang_rs.h b/slang_rs.h
index 661b299..08b6674 100644
--- a/slang_rs.h
+++ b/slang_rs.h
@@ -153,7 +153,8 @@ class SlangRS : public Slang {
 
   virtual void makeModuleVisible(clang::Module *Mod,
                                  clang::Module::NameVisibilityKind Visibility,
-                                 clang::SourceLocation ImportLoc) { }
+                                 clang::SourceLocation ImportLoc,
+                                 bool Complain = false) { }
 };
 }  // namespace slang
 
diff --git a/slang_rs_object_ref_count.cpp b/slang_rs_object_ref_count.cpp
index 9a4057b..166344e 100644
--- a/slang_rs_object_ref_count.cpp
+++ b/slang_rs_object_ref_count.cpp
@@ -499,7 +499,6 @@ static clang::Stmt *ClearArrayRSObject(
                              &II,
                              C.IntTy,
                              C.getTrivialTypeSourceInfo(C.IntTy),
-                             clang::SC_None,
                              clang::SC_None);
   clang::Decl *IID = (clang::Decl *)IIVD;
 
@@ -1547,7 +1546,8 @@ clang::FunctionDecl *RSObjectRefCount::CreateStaticGlobalDtor() {
       if (CountRSObjectTypes(mCtx, VD->getType().getTypePtr(), loc)) {
         if (!FD) {
           // Only create FD if we are going to use it.
-          FD = clang::FunctionDecl::Create(mCtx, DC, loc, loc, N, T, NULL);
+          FD = clang::FunctionDecl::Create(mCtx, DC, loc, loc, N, T, NULL,
+                                           clang::SC_None);
         }
         // Make sure to create any helpers within the function's DeclContext,
         // not the one associated with the global translation unit.