-
Notifications
You must be signed in to change notification settings - Fork 15.2k
[clang][bytecode] Implement case ranges #168418
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
+133
−3
Conversation
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
Implement GNU case ranges for constexpr bytecode interpreter. Closes llvm#165969
Member
|
@llvm/pr-subscribers-clang Author: marius doerner (mariusdr) ChangesFixes #165969 Implement GNU case ranges for constexpr bytecode interpreter. Full diff: https://github.com/llvm/llvm-project/pull/168418.diff 2 Files Affected:
diff --git a/clang/lib/AST/ByteCode/Compiler.cpp b/clang/lib/AST/ByteCode/Compiler.cpp
index f8bbfed8bb387..f52f6e396bb47 100644
--- a/clang/lib/AST/ByteCode/Compiler.cpp
+++ b/clang/lib/AST/ByteCode/Compiler.cpp
@@ -6016,11 +6016,38 @@ bool Compiler<Emitter>::visitSwitchStmt(const SwitchStmt *S) {
for (const SwitchCase *SC = S->getSwitchCaseList(); SC;
SC = SC->getNextSwitchCase()) {
if (const auto *CS = dyn_cast<CaseStmt>(SC)) {
- // FIXME: Implement ranges.
- if (CS->caseStmtIsGNURange())
- return false;
CaseLabels[SC] = this->getLabel();
+ if (CS->caseStmtIsGNURange()) {
+ LabelTy EndOfRangeCheck = this->getLabel();
+ const Expr *Low = CS->getLHS();
+ const Expr *High = CS->getRHS();
+ if (Low->isValueDependent() || High->isValueDependent())
+ return false;
+
+ if (!this->emitGetLocal(CondT, CondVar, CS))
+ return false;
+ if (!this->visit(Low))
+ return false;
+ PrimType LT = this->classifyPrim(Low->getType());
+ if (!this->emitGE(LT, S))
+ return false;
+ if (!this->jumpFalse(EndOfRangeCheck))
+ return false;
+
+ if (!this->emitGetLocal(CondT, CondVar, CS))
+ return false;
+ if (!this->visit(High))
+ return false;
+ PrimType HT = this->classifyPrim(High->getType());
+ if (!this->emitLE(HT, S))
+ return false;
+ if (!this->jumpTrue(CaseLabels[CS]))
+ return false;
+ this->emitLabel(EndOfRangeCheck);
+ continue;
+ }
+
const Expr *Value = CS->getLHS();
if (Value->isValueDependent())
return false;
diff --git a/clang/test/AST/ByteCode/switch.cpp b/clang/test/AST/ByteCode/switch.cpp
index 8136f92f5dfd3..39b949950f22b 100644
--- a/clang/test/AST/ByteCode/switch.cpp
+++ b/clang/test/AST/ByteCode/switch.cpp
@@ -86,3 +86,71 @@ constexpr int another_test(int val) { // both-note {{declared here}}
}
static_assert(another_test(1) == 100, ""); // both-error {{static assertion failed}} \
// both-note {{evaluates to}}
+
+namespace gnurange {
+constexpr int l(int n) {
+ return n + 1;
+}
+constexpr int h(int n) {
+ return 2 * n + 1;
+}
+constexpr int f(int x) {
+ const int n = 2;
+ constexpr struct {
+ char lo {'a'};
+ char hi {'z'};
+ } s;
+
+ switch (x) {
+ case l(n) ... h(n):
+ return 1;
+ case -1 ... 1:
+ return 2;
+ case 9 ... 14:
+ return 3;
+ case 15:
+ return 4;
+ case 16 ... 20:
+ return 5;
+ case s.lo ... s.hi:
+ return 6;
+ default:
+ return -1;
+ }
+}
+static_assert(f(0) == 2);
+static_assert(f(2) == -1);
+static_assert(f(3) == 1);
+static_assert(f(4) == 1);
+static_assert(f(5) == 1);
+static_assert(f(6) == -1);
+static_assert(f(14) == 3);
+static_assert(f(15) == 4);
+static_assert(f(16) == 5);
+static_assert(f(20) == 5);
+static_assert(f('d') == 6);
+
+template <int Lo, int Hi>
+constexpr bool g(int x) {
+ switch (x) {
+ case Lo ... Hi:
+ break;
+ default:
+ return false;
+ }
+ return true;
+}
+static_assert(g<100, 200>(132));
+
+constexpr bool j(int x) { // both-note {{declared here}}
+ switch (x) {
+ case bad(x) ... 100: // both-error {{case value is not a constant expression}} \
+ // both-note {{cannot be used in a constant expression}}
+ return true;
+ default:
+ break;
+ }
+ return false;
+}
+static_assert(j(1)); // both-error {{static assertion failed}}
+}
|
🐧 Linux x64 Test Results
|
tbaederr
reviewed
Nov 18, 2025
tbaederr
approved these changes
Nov 19, 2025
Contributor
Author
|
@tbaederr Thanks for the review, could you merge it for me? Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
clang:bytecode
Issues for the clang bytecode constexpr interpreter
clang:frontend
Language frontend issues, e.g. anything involving "Sema"
clang
Clang issues not falling into any other category
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.
Fixes #165969
Implement GNU case ranges for constexpr bytecode interpreter.