Merge pull request #30953 from adrian-prantl/deconstify-master

fredriss · web-flow · commit 503da8fa230f · 2020-04-10T15:16:06.000-07:00
Convert a clang::Module to non-const to account for a clang API change
diff --git a/lib/ClangImporter/ClangImporter.cpp b/lib/ClangImporter/ClangImporter.cpp
@@ -3310,7 +3310,7 @@ ClangModuleUnit::ClangModuleUnit(ModuleDecl &M,
     clangModule(clangModule) {
   // Capture the file metadata before it goes away.
   if (clangModule)
-    ASTSourceDescriptor = {*clangModule};
+    ASTSourceDescriptor = {*const_cast<clang::Module *>(clangModule)};
 }
 
 StringRef ClangModuleUnit::getModuleDefiningPath() const {

Original file line number	Diff line number	Diff line change
`@@ -3310,7 +3310,7 @@ ClangModuleUnit::ClangModuleUnit(ModuleDecl &M,`
`3310`	`3310`	`clangModule(clangModule) {`
`3311`	`3311`	`// Capture the file metadata before it goes away.`
`3312`	`3312`	`if (clangModule)`
`3313`		`- ASTSourceDescriptor = {*clangModule};`
	`3313`	`+ ASTSourceDescriptor = {const_cast<clang::Module >(clangModule)};`
`3314`	`3314`	`}`
`3315`	`3315`
`3316`	`3316`	`StringRef ClangModuleUnit::getModuleDefiningPath() const {`