Do not use the incorrect attribute spelling list index when translating a no_sanitize_foo attribute into a no_sanitize("foo") attribute.
This fixes a crash when AST pretty printing declarations marked with no_sanitize_memory.
llvm-svn: 361274
diff --git a/clang/lib/Sema/SemaDeclAttr.cpp b/clang/lib/Sema/SemaDeclAttr.cpp
index f8a3457..03b38bf 100644
--- a/clang/lib/Sema/SemaDeclAttr.cpp
+++ b/clang/lib/Sema/SemaDeclAttr.cpp
@@ -6329,9 +6329,21 @@
if (isGlobalVar(D) && SanitizerName != "address")
S.Diag(D->getLocation(), diag::err_attribute_wrong_decl_type)
<< AL << ExpectedFunction;
- D->addAttr(::new (S.Context)
- NoSanitizeAttr(AL.getRange(), S.Context, &SanitizerName, 1,
- AL.getAttributeSpellingListIndex()));
+
+ // FIXME: Rather than create a NoSanitizeSpecificAttr, this creates a
+ // NoSanitizeAttr object; but we need to calculate the correct spelling list
+ // index rather than incorrectly assume the index for NoSanitizeSpecificAttr
+ // has the same spellings as the index for NoSanitizeAttr. We don't have a
+ // general way to "translate" between the two, so this hack attempts to work
+ // around the issue with hard-coded indicies. This is critical for calling
+ // getSpelling() or prettyPrint() on the resulting semantic attribute object
+ // without failing assertions.
+ unsigned TranslatedSpellingIndex = 0;
+ if (AL.isC2xAttribute() || AL.isCXX11Attribute())
+ TranslatedSpellingIndex = 1;
+
+ D->addAttr(::new (S.Context) NoSanitizeAttr(
+ AL.getRange(), S.Context, &SanitizerName, 1, TranslatedSpellingIndex));
}
static void handleInternalLinkageAttr(Sema &S, Decl *D, const ParsedAttr &AL) {