2 files changed, 1 insertions, 24 deletions
diff --git a/include/clang/Sema/ParsedAttr.h b/include/clang/Sema/ParsedAttr.h
index a42e4547a9..2e0efe452a 100644
--- a/include/clang/Sema/ParsedAttr.h
+++ b/include/clang/Sema/ParsedAttr.h
@@ -167,8 +167,6 @@ public:
 private:
   IdentifierInfo *AttrName;
   IdentifierInfo *ScopeName;
-  IdentifierInfo *MacroII = nullptr;
-  SourceLocation MacroExpansionLoc;
   SourceRange AttrRange;
   SourceLocation ScopeLoc;
   SourceLocation EllipsisLoc;
@@ -549,27 +547,6 @@ public:
     return getPropertyDataBuffer().SetterId;
   }
 
-  /// Set the macro identifier info object that this parsed attribute was
-  /// declared in if it was declared in a macro. Also set the expansion location
-  /// of the macro.
-  void setMacroIdentifier(IdentifierInfo *MacroName, SourceLocation Loc) {
-    MacroII = MacroName;
-    MacroExpansionLoc = Loc;
-  }
-
-  /// Returns true if this attribute was declared in a macro.
-  bool hasMacroIdentifier() const { return MacroII != nullptr; }
-
-  /// Return the macro identifier if this attribute was declared in a macro.
-  /// nullptr is returned if it was not declared in a macro.
-  IdentifierInfo *getMacroIdentifier() const { return MacroII; }
-
-  SourceLocation getMacroExpansionLoc() const {
-    assert(hasMacroIdentifier() && "Can only get the macro expansion location "
-                                   "if this attribute has a macro identifier.");
-    return MacroExpansionLoc;
-  }
-
   /// Get an index into the attribute spelling list
   /// defined in Attr.td. This index is used by an attribute
   /// to pretty print itself.
diff --git a/include/clang/Sema/Sema.h b/include/clang/Sema/Sema.h
index 0796e99858..64b92d2e7a 100644
--- a/include/clang/Sema/Sema.h
+++ b/include/clang/Sema/Sema.h
@@ -3516,7 +3516,7 @@ public:
   // Check if there is an explicit attribute, but only look through parens.
   // The intent is to look for an attribute on the current declarator, but not
   // one that came from a typedef.
-  bool hasExplicitCallingConv(QualType T);
+  bool hasExplicitCallingConv(QualType &T);
 
   /// Get the outermost AttributedType node that sets a calling convention.
   /// Valid types should not have multiple attributes with different CCs.