[Preprocessor] For the MacroExpands preprocessor callback, also pass the MacroArgs object that provides information about

the argument tokens for a function macro.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@181065 91177308-0d34-0410-b5e6-96231b3b80d8

6 files changed, 10 insertions, 133 deletions

diff --git a/lib/Lex/MacroArgs.cpp b/lib/Lex/MacroArgs.cpp
index f6e781a936..d2dc04b36c 100644
--- a/lib/Lex/MacroArgs.cpp
+++ b/lib/Lex/MacroArgs.cpp
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "MacroArgs.h"
+#include "clang/Lex/MacroArgs.h"
 #include "clang/Lex/LexDiagnostic.h"
 #include "clang/Lex/MacroInfo.h"
 #include "clang/Lex/Preprocessor.h"
diff --git a/lib/Lex/MacroArgs.h b/lib/Lex/MacroArgs.h
deleted file mode 100644
index 1fd295ebfa..0000000000
--- a/lib/Lex/MacroArgs.h
+++ /dev/null
@@ -1,125 +0,0 @@
-//===--- MacroArgs.h - Formal argument info for Macros ----------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This file defines the MacroArgs interface.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_CLANG_MACROARGS_H
-#define LLVM_CLANG_MACROARGS_H
-
-#include "clang/Basic/LLVM.h"
-#include "llvm/ADT/ArrayRef.h"
-#include <vector>
-
-namespace clang {
-  class MacroInfo;
-  class Preprocessor;
-  class Token;
-  class SourceLocation;
-
-/// MacroArgs - An instance of this class captures information about
-/// the formal arguments specified to a function-like macro invocation.
-class MacroArgs {
-  /// NumUnexpArgTokens - The number of raw, unexpanded tokens for the
-  /// arguments.  All of the actual argument tokens are allocated immediately
-  /// after the MacroArgs object in memory.  This is all of the arguments
-  /// concatenated together, with 'EOF' markers at the end of each argument.
-  unsigned NumUnexpArgTokens;
-
-  /// VarargsElided - True if this is a C99 style varargs macro invocation and
-  /// there was no argument specified for the "..." argument.  If the argument
-  /// was specified (even empty) or this isn't a C99 style varargs function, or
-  /// if in strict mode and the C99 varargs macro had only a ... argument, this
-  /// is false.
-  bool VarargsElided;
-  
-  /// PreExpArgTokens - Pre-expanded tokens for arguments that need them.  Empty
-  /// if not yet computed.  This includes the EOF marker at the end of the
-  /// stream.
-  std::vector<std::vector<Token> > PreExpArgTokens;
-
-  /// StringifiedArgs - This contains arguments in 'stringified' form.  If the
-  /// stringified form of an argument has not yet been computed, this is empty.
-  std::vector<Token> StringifiedArgs;
-
-  /// ArgCache - This is a linked list of MacroArgs objects that the
-  /// Preprocessor owns which we use to avoid thrashing malloc/free.
-  MacroArgs *ArgCache;
-  
-  MacroArgs(unsigned NumToks, bool varargsElided)
-    : NumUnexpArgTokens(NumToks), VarargsElided(varargsElided), ArgCache(0) {}
-  ~MacroArgs() {}
-public:
-  /// MacroArgs ctor function - Create a new MacroArgs object with the specified
-  /// macro and argument info.
-  static MacroArgs *create(const MacroInfo *MI,
-                           ArrayRef<Token> UnexpArgTokens,
-                           bool VarargsElided, Preprocessor &PP);
-
-  /// destroy - Destroy and deallocate the memory for this object.
-  ///
-  void destroy(Preprocessor &PP);
-
-  /// ArgNeedsPreexpansion - If we can prove that the argument won't be affected
-  /// by pre-expansion, return false.  Otherwise, conservatively return true.
-  bool ArgNeedsPreexpansion(const Token *ArgTok, Preprocessor &PP) const;
-
-  /// getUnexpArgument - Return a pointer to the first token of the unexpanded
-  /// token list for the specified formal.
-  ///
-  const Token *getUnexpArgument(unsigned Arg) const;
-
-  /// getArgLength - Given a pointer to an expanded or unexpanded argument,
-  /// return the number of tokens, not counting the EOF, that make up the
-  /// argument.
-  static unsigned getArgLength(const Token *ArgPtr);
-
-  /// getPreExpArgument - Return the pre-expanded form of the specified
-  /// argument.
-  const std::vector<Token> &
-    getPreExpArgument(unsigned Arg, const MacroInfo *MI, Preprocessor &PP);
-
-  /// getStringifiedArgument - Compute, cache, and return the specified argument
-  /// that has been 'stringified' as required by the # operator.
-  const Token &getStringifiedArgument(unsigned ArgNo, Preprocessor &PP,
-                                      SourceLocation ExpansionLocStart,
-                                      SourceLocation ExpansionLocEnd);
-
-  /// getNumArguments - Return the number of arguments passed into this macro
-  /// invocation.
-  unsigned getNumArguments() const { return NumUnexpArgTokens; }
-
-
-  /// isVarargsElidedUse - Return true if this is a C99 style varargs macro
-  /// invocation and there was no argument specified for the "..." argument.  If
-  /// the argument was specified (even empty) or this isn't a C99 style varargs
-  /// function, or if in strict mode and the C99 varargs macro had only a ...
-  /// argument, this returns false.
-  bool isVarargsElidedUse() const { return VarargsElided; }
-
-  /// StringifyArgument - Implement C99 6.10.3.2p2, converting a sequence of
-  /// tokens into the literal string token that should be produced by the C #
-  /// preprocessor operator.  If Charify is true, then it should be turned into
-  /// a character literal for the Microsoft charize (#@) extension.
-  ///
-  static Token StringifyArgument(const Token *ArgToks,
-                                 Preprocessor &PP, bool Charify,
-                                 SourceLocation ExpansionLocStart,
-                                 SourceLocation ExpansionLocEnd);
-  
-  
-  /// deallocate - This should only be called by the Preprocessor when managing
-  /// its freelist.
-  MacroArgs *deallocate();
-};
-
-}  // end namespace clang
-
-#endif
diff --git a/lib/Lex/PPMacroExpansion.cpp b/lib/Lex/PPMacroExpansion.cpp
index e5b00d6bb8..167823358a 100644
--- a/lib/Lex/PPMacroExpansion.cpp
+++ b/lib/Lex/PPMacroExpansion.cpp
@@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang/Lex/Preprocessor.h"
-#include "MacroArgs.h"
+#include "clang/Lex/MacroArgs.h"
 #include "clang/Basic/FileManager.h"
 #include "clang/Basic/SourceManager.h"
 #include "clang/Basic/TargetInfo.h"
@@ -223,7 +223,7 @@ bool Preprocessor::HandleMacroExpandedIdentifier(Token &Identifier,
   // If this is a builtin macro, like __LINE__ or _Pragma, handle it specially.
   if (MI->isBuiltinMacro()) {
     if (Callbacks) Callbacks->MacroExpands(Identifier, MD,
-                                           Identifier.getLocation());
+                                           Identifier.getLocation(),/*Args=*/0);
     ExpandBuiltinMacro(Identifier);
     return false;
   }
@@ -277,11 +277,12 @@ bool Preprocessor::HandleMacroExpandedIdentifier(Token &Identifier,
       DelayedMacroExpandsCallbacks.push_back(
                               MacroExpandsInfo(Identifier, MD, ExpansionRange));
     } else {
-      Callbacks->MacroExpands(Identifier, MD, ExpansionRange);
+      Callbacks->MacroExpands(Identifier, MD, ExpansionRange, Args);
       if (!DelayedMacroExpandsCallbacks.empty()) {
         for (unsigned i=0, e = DelayedMacroExpandsCallbacks.size(); i!=e; ++i) {
           MacroExpandsInfo &Info = DelayedMacroExpandsCallbacks[i];
-          Callbacks->MacroExpands(Info.Tok, Info.MD, Info.Range);
+          // FIXME: We lose macro args info with delayed callback.
+          Callbacks->MacroExpands(Info.Tok, Info.MD, Info.Range, /*Args=*/0);
         }
         DelayedMacroExpandsCallbacks.clear();
       }
diff --git a/lib/Lex/PreprocessingRecord.cpp b/lib/Lex/PreprocessingRecord.cpp
index b10e7f7bee..426b922562 100644
--- a/lib/Lex/PreprocessingRecord.cpp
+++ b/lib/Lex/PreprocessingRecord.cpp
@@ -406,7 +406,8 @@ void PreprocessingRecord::Defined(const Token &MacroNameTok,
 }
 
 void PreprocessingRecord::MacroExpands(const Token &Id,const MacroDirective *MD,
-                                       SourceRange Range) {
+                                       SourceRange Range,
+                                       const MacroArgs *Args) {
   addMacroExpansion(Id, MD->getMacroInfo(), Range);
 }
 
diff --git a/lib/Lex/Preprocessor.cpp b/lib/Lex/Preprocessor.cpp
index 09f827991d..66f23f1018 100644
--- a/lib/Lex/Preprocessor.cpp
+++ b/lib/Lex/Preprocessor.cpp
@@ -26,7 +26,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang/Lex/Preprocessor.h"
-#include "MacroArgs.h"
+#include "clang/Lex/MacroArgs.h"
 #include "clang/Basic/FileManager.h"
 #include "clang/Basic/SourceManager.h"
 #include "clang/Basic/TargetInfo.h"
diff --git a/lib/Lex/TokenLexer.cpp b/lib/Lex/TokenLexer.cpp
index 5b41fe9b8d..07753c7d7c 100644
--- a/lib/Lex/TokenLexer.cpp
+++ b/lib/Lex/TokenLexer.cpp
@@ -12,7 +12,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang/Lex/TokenLexer.h"
-#include "MacroArgs.h"
+#include "clang/Lex/MacroArgs.h"
 #include "clang/Basic/SourceManager.h"
 #include "clang/Lex/LexDiagnostic.h"
 #include "clang/Lex/MacroInfo.h"