| commit | 78b0c91daf16146034982fc3f7dd8d1ba90b3a0a | [log] [tgz] |
|---|---|---|
| author | Olli Etuaho <oetuaho@nvidia.com> | Mon Nov 21 14:23:06 2016 +0000 |
| committer | Commit Bot <commit-bot@chromium.org> | Tue Nov 22 13:39:46 2016 +0000 |
| tree | dff26f9c086a2c179a57b445dfefc91c20050384 | |
| parent | 4dc3af09ddc7b31dba894748edb73052f7fff92e [diff] [blame] |
Fix infinite recursion in macro expansion BUG=angleproject:1600 TEST=angle_unittests Change-Id: I72bf81ec060f36255a0f13b132a4fd69b89672ff Reviewed-on: https://chromium-review.googlesource.com/412744 Commit-Queue: Olli Etuaho <oetuaho@nvidia.com> Reviewed-by: Jamie Madill <jmadill@chromium.org>
diff --git a/src/compiler/preprocessor/MacroExpander.h b/src/compiler/preprocessor/MacroExpander.h index 77c767c..3a8450f 100644 --- a/src/compiler/preprocessor/MacroExpander.h +++ b/src/compiler/preprocessor/MacroExpander.h
@@ -67,6 +67,11 @@ std::unique_ptr<Token> mReserveToken; std::vector<MacroContext *> mContextStack; size_t mTotalTokensInContexts; + + bool mDeferReenablingMacros; + std::vector<const Macro *> mMacrosToReenable; + + class ScopedMacroReenabler; }; } // namespace pp