Merge pull request #1933 from dcci/nevergiveuponyourast

dcci · web-flow · commit b1c0fa356bea · 2019-08-29T09:46:32.000-07:00
[ClangASTSource] Remove divergence between upstream and swift-lldb.

apple-llvm-split-commit: ced573ddbb9b077855027f7f444677bc1519cf83
apple-llvm-split-dir: lldb/
diff --git a/lldb/source/Plugins/ExpressionParser/Clang/ClangASTSource.cpp b/lldb/source/Plugins/ExpressionParser/Clang/ClangASTSource.cpp
@@ -599,13 +599,10 @@ void ClangASTSource::FindExternalLexicalDecls(
   }
 
   if (TagDecl *original_tag_decl = dyn_cast<TagDecl>(original_decl)) {
-    if (original_tag_decl->hasExternalLexicalStorage() ||
-        original_tag_decl->hasExternalVisibleStorage()) {
-      ExternalASTSource *external_source = original_ctx->getExternalSource();
+    ExternalASTSource *external_source = original_ctx->getExternalSource();
 
-      if (external_source)
-        external_source->CompleteType(original_tag_decl);
-    }
+    if (external_source)
+      external_source->CompleteType(original_tag_decl);
   }
 
   const DeclContext *original_decl_context =

Original file line number	Diff line number	Diff line change
`@@ -599,13 +599,10 @@ void ClangASTSource::FindExternalLexicalDecls(`
`599`	`599`	`}`
`600`	`600`
`601`	`601`	`if (TagDecl *original_tag_decl = dyn_cast<TagDecl>(original_decl)) {`
`602`		`- if (original_tag_decl->hasExternalLexicalStorage() \|\|`
`603`		`- original_tag_decl->hasExternalVisibleStorage()) {`
`604`		`- ExternalASTSource *external_source = original_ctx->getExternalSource();`
	`602`	`+ ExternalASTSource *external_source = original_ctx->getExternalSource();`
`605`	`603`
`606`		`- if (external_source)`
`607`		`- external_source->CompleteType(original_tag_decl);`
`608`		`- }`
	`604`	`+ if (external_source)`
	`605`	`+ external_source->CompleteType(original_tag_decl);`
`609`	`606`	`}`
`610`	`607`
`611`	`608`	`const DeclContext *original_decl_context =`