[PATCH] D66839: Fix stack address builtin for negative numbers

[Zoe Carver via Phabricator via cfe-commits]

zoecarver updated this revision to Diff 246277.
zoecarver added a comment.

- move verification to SemaChecking


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D66839/new/

https://reviews.llvm.org/D66839

Files:
  clang/lib/Sema/SemaChecking.cpp
  clang/test/Sema/builtin-stackaddress.c


Index: clang/test/Sema/builtin-stackaddress.c
===================================================================
--- clang/test/Sema/builtin-stackaddress.c
+++ clang/test/Sema/builtin-stackaddress.c
@@ -1,5 +1,6 @@
 // RUN: %clang_cc1 -fsyntax-only -verify %s
-void* a(unsigned x) {
+
+void a(unsigned x) {
 return __builtin_return_address(0);
 }
 
@@ -8,9 +9,30 @@
 }
 
 void* c(unsigned x) {
+// expected-error at +1 {{argument value 4294967295 is outside the valid range [0, 65535]}}
+return __builtin_return_address(-1);
+}
+
+void* d(unsigned x) {
+// expected-error at +1 {{argument value 1048575 is outside the valid range [0, 65535]}}
+return __builtin_return_address(0xFFFFF);
+}
+
+void* e(unsigned x) {
 return __builtin_frame_address(0);
 }
 
-void d(unsigned x) {
-return __builtin_frame_address(x); // expected-error{{argument to '__builtin_frame_address' must be a constant integer}}
+void f(unsigned x) {
+// expected-error at +1 {{argument to '__builtin_frame_address' must be a constant integer}}
+return __builtin_frame_address(x);
+}
+
+void* g(unsigned x) {
+// expected-error at +1 {{argument value 4294967295 is outside the valid range [0, 65535]}}
+return __builtin_frame_address(-1);
+}
+
+void* h(unsigned x) {
+// expected-error at +1 {{argument value 1048575 is outside the valid range [0, 65535]}}
+return __builtin_frame_address(0xFFFFF);
 }
Index: clang/lib/Sema/SemaChecking.cpp
===================================================================
--- clang/lib/Sema/SemaChecking.cpp
+++ clang/lib/Sema/SemaChecking.cpp
@@ -1847,6 +1847,11 @@
     if (SemaBuiltinOSLogFormat(TheCall))
       return ExprError();
     break;
+  case Builtin::BI__builtin_frame_address:
+  case Builtin::BI__builtin_return_address:
+    if (!SemaBuiltinConstantArgRange(TheCall, 0, 0, 0xFFFF))
+      return ExprError();
+    break;
   }
 
   // Since the target specific builtins for each arch overlap, only check those


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D66839.246277.patch
Type: text/x-patch
Size: 1919 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20200224/99ed54d2/attachment.bin>