kc3-lang/angle/src/compiler/preprocessor/MacroExpander.h

• Show log

  Commit

• Hash : 47cd0529
  Author :
  Date : 2024-03-04T15:19:30
  

  Fix assert invoking #line during macro invocation
  
  Fix an assert with preprocessor content of form:
   f
   #line f()
   (x
  
  If the #line macro function invocation forms an invalid line number, the
  line directive parsing will stop and unwind the macro context stack.
  However, it did not do the state management related to unwinding the
  context: it left the f function marked as "disabled".
  
  Fix by managing the state in the unwind scenario.
  
  Also make MacroContext be allocated from the context stack vector
  instead of heap.
  
  Also fix all the define tests to expect a version directive call.
  
  Fixed: angleproject:8578
  Change-Id: I31dbeb911b07779eebe28bf58f13cec8876aa982
  Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/5342495
  Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
  Reviewed-by: Kenneth Russell <kbr@chromium.org>
  Auto-Submit: Kimmo Kinnunen <kkinnunen@apple.com>
  Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>
  

Download

• src/compiler/preprocessor/MacroExpander.h

• //
  // Copyright 2012 The ANGLE Project Authors. All rights reserved.
  // Use of this source code is governed by a BSD-style license that can be
  // found in the LICENSE file.
  //
  
  #ifndef COMPILER_PREPROCESSOR_MACROEXPANDER_H_
  #define COMPILER_PREPROCESSOR_MACROEXPANDER_H_
  
  #include <memory>
  #include <vector>
  
  #include "compiler/preprocessor/Lexer.h"
  #include "compiler/preprocessor/Macro.h"
  #include "compiler/preprocessor/Preprocessor.h"
  
  namespace angle
  {
  
  namespace pp
  {
  
  class Diagnostics;
  struct SourceLocation;
  
  class MacroExpander : public Lexer
  {
    public:
      MacroExpander(Lexer *lexer,
                    MacroSet *macroSet,
                    Diagnostics *diagnostics,
                    const PreprocessorSettings &settings,
                    bool parseDefined);
      ~MacroExpander() override;
  
      void lex(Token *token) override;
  
    private:
      void getToken(Token *token);
      void ungetToken(const Token &token);
      bool isNextTokenLeftParen();
  
      bool pushMacro(std::shared_ptr<Macro> macro, const Token &identifier);
      void popMacro();
  
      bool expandMacro(const Macro &macro, const Token &identifier, std::vector<Token> *replacements);
  
      typedef std::vector<Token> MacroArg;
      bool collectMacroArgs(const Macro &macro,
                            const Token &identifier,
                            std::vector<MacroArg> *args,
                            SourceLocation *closingParenthesisLocation);
      void replaceMacroParams(const Macro &macro,
                              const std::vector<MacroArg> &args,
                              std::vector<Token> *replacements);
  
      struct MacroContext
      {
          bool empty() const;
          const Token &get();
          void unget();
  
          std::shared_ptr<Macro> macro;
          std::vector<Token> replacements;
          std::size_t index = 0;
      };
  
      Lexer *mLexer;
      MacroSet *mMacroSet;
      Diagnostics *mDiagnostics;
      bool mParseDefined;
  
      std::unique_ptr<Token> mReserveToken;
      std::vector<MacroContext> mContextStack;
      size_t mTotalTokensInContexts;
  
      PreprocessorSettings mSettings;
  
      bool mDeferReenablingMacros;
      std::vector<std::shared_ptr<Macro>> mMacrosToReenable;
  
      class ScopedMacroReenabler;
  };
  
  }  // namespace pp
  
  }  // namespace angle
  
  #endif  // COMPILER_PREPROCESSOR_MACROEXPANDER_H_
  

Download