Extend clang lexer to support contract-keywords and gate behind -fverify-contracts - #2
Merged
Merged
Conversation
-fverify-contracts
There was a problem hiding this comment.
Pull request overview
Extends Clang’s lexer/identifier handling to recognize a set of “contract” keywords only when -fverify-contracts is enabled, and wires the new flag through the driver/cc1 along with targeted tests.
Changes:
- Add
KEYCONTRACTgating and register new contract keywords inTokenKinds.def. - Introduce
LangOptions::VerifyContractsand connect keyword enablement to it viaIdentifierTable. - Add
-fverify-contractsdriver forwarding plus new driver/lexer tests.
Reviewed changes
Copilot reviewed 8 out of 8 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| clang/test/Lexer/verify_contracts_keywords.cpp | Verifies keyword-vs-identifier lexing behavior with and without -fverify-contracts. |
| clang/test/Driver/verify_contracts.cpp | Ensures -fverify-contracts is forwarded to cc1 and is absent by default. |
| clang/lib/Driver/ToolChains/Clang.cpp | Forwards -fverify-contracts to cc1 using opt-in flag handling. |
| clang/lib/Basic/IdentifierTable.cpp | Enables/disables KEYCONTRACT keywords based on LangOptions::VerifyContracts. |
| clang/include/clang/Options/Options.td | Defines -fverify-contracts and maps it to LangOptions::VerifyContracts. |
| clang/include/clang/Basic/TokenKinds.def | Adds KEYCONTRACT and the contract keyword list. |
| clang/include/clang/Basic/LangOptions.def | Introduces the VerifyContracts language option. |
| clang/include/clang/Basic/IdentifierTable.h | Adds the KEYCONTRACT token key bit and updates KEYMAX. |
SwayamInSync
commented
Apr 9, 2026
| ``` | ||
|
|
||
| ## Getting the Source Code and Building LLVM | ||
| ## Contract syntax reference |
Owner
Author
There was a problem hiding this comment.
We could've also added the build instructions but since the scope is limited of this PR (just lexer support) so to avoid confusion those can be happen at later mature stages
Owner
Author
|
Also in a follow-up, it might be better to rename |
SwayamInSync
added a commit
that referenced
this pull request
Jul 27, 2026
Extend clang lexer to support contract-keywords and gate behind `-fverify-contracts`
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Extends Clang with first-class contract syntax keywords for deductive verification, gated behind the
-fverify-contractsflag.Changes
TokenKinds.def:pre,post,invariant,decreases,ghost,spec_fn,proof_fnKEYCONTRACTflag, only active when-fverify-contractsis passed-fverify-contracts/-fno-verify-contractsdriver and CC1 flagsVerifyContractstoLangOptionsIdentifierTableto handle contract keyword registrationverify_contracts.cpp) and lexer test (verify_contracts_keywords.cpp)Design
Keywords are invisible to normal compilation — they remain plain identifiers unless
-fverify-contractsis explicitly passed. This ensures zero impact on existing C++ code.