This revision was landed with ongoing or failed builds.
This revision was automatically updated to reflect the committed changes.
Closed by commit rG2afcda693acb: [-Wunsafe-buffer-usage] Fix assertion failure
in case of BindingDecl (authored by t-rasmud).
Herald added a project: clang.
Herald added a subscriber: cfe-commits.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D158112/new/
https://reviews.llvm.org/D158112
Files:
clang/lib/Analysis/UnsafeBufferUsage.cpp
clang/test/SemaCXX/warn-unsafe-buffer-usage-debug.cpp
Index: clang/test/SemaCXX/warn-unsafe-buffer-usage-debug.cpp
===================================================================
--- clang/test/SemaCXX/warn-unsafe-buffer-usage-debug.cpp
+++ clang/test/SemaCXX/warn-unsafe-buffer-usage-debug.cpp
@@ -78,3 +78,23 @@
auto [x, y] = a;
x = 9;
}
+
+void test_claim_use_multiple() {
+ int *a = new int[8]; // expected-warning{{'a' is an unsafe pointer used for buffer access}}
+ a[6] = 9; // expected-note{{used in buffer access here}}
+ a++; // expected-note{{used in pointer arithmetic here}} \
+ // debug-note{{safe buffers debug: failed to produce fixit for 'a' : has an unclaimed use}}
+}
+
+struct S
+{
+ int *x;
+};
+
+S f() { return S{new int[4]}; }
+
+void test_struct_claim_use() {
+ auto [x] = f();
+ x[6] = 8; // expected-warning{{unsafe buffer access}}
+ x++; // expected-warning{{unsafe pointer arithmetic}}
+}
Index: clang/lib/Analysis/UnsafeBufferUsage.cpp
===================================================================
--- clang/lib/Analysis/UnsafeBufferUsage.cpp
+++ clang/lib/Analysis/UnsafeBufferUsage.cpp
@@ -380,6 +380,10 @@
}
};
+static auto toSupportedVariable() {
+ return to(varDecl());
+}
+
using FixableGadgetList = std::vector<std::unique_ptr<FixableGadget>>;
using WarningGadgetList = std::vector<std::unique_ptr<WarningGadget>>;
@@ -566,7 +570,8 @@
static Matcher matcher() {
auto PtrInitStmt = declStmt(hasSingleDecl(varDecl(
hasInitializer(ignoringImpCasts(declRefExpr(
- hasPointerType()).
+ hasPointerType(),
+ toSupportedVariable()).
bind(PointerInitRHSTag)))).
bind(PointerInitLHSTag)));
@@ -616,10 +621,10 @@
static Matcher matcher() {
auto PtrAssignExpr = binaryOperator(allOf(hasOperatorName("="),
hasRHS(ignoringParenImpCasts(declRefExpr(hasPointerType(),
- to(varDecl())).
+ toSupportedVariable()).
bind(PointerAssignRHSTag))),
hasLHS(declRefExpr(hasPointerType(),
- to(varDecl())).
+ toSupportedVariable()).
bind(PointerAssignLHSTag))));
return stmt(isInUnspecifiedUntypedContext(PtrAssignExpr));
@@ -691,7 +696,8 @@
static Matcher matcher() {
auto ArrayOrPtr = anyOf(hasPointerType(), hasArrayType());
auto BaseIsArrayOrPtrDRE =
- hasBase(ignoringParenImpCasts(declRefExpr(ArrayOrPtr)));
+ hasBase(ignoringParenImpCasts(declRefExpr(ArrayOrPtr,
+ toSupportedVariable())));
auto Target =
arraySubscriptExpr(BaseIsArrayOrPtrDRE).bind(ULCArraySubscriptTag);
@@ -733,7 +739,8 @@
static Matcher matcher() {
auto ArrayOrPtr = anyOf(hasPointerType(), hasArrayType());
auto target = expr(
- ignoringParenImpCasts(declRefExpr(allOf(ArrayOrPtr, to(varDecl()))).bind(DeclRefExprTag)));
+ ignoringParenImpCasts(declRefExpr(allOf(ArrayOrPtr,
+ toSupportedVariable())).bind(DeclRefExprTag)));
return stmt(isInUnspecifiedPointerContext(target));
}
@@ -769,7 +776,7 @@
unaryOperator(
hasOperatorName("*"),
has(expr(ignoringParenImpCasts(
- declRefExpr(to(varDecl())).bind(BaseDeclRefExprTag)))))
+ declRefExpr(toSupportedVariable()).bind(BaseDeclRefExprTag)))))
.bind(OperatorTag);
return expr(isInUnspecifiedLvalueContext(Target));
@@ -809,7 +816,8 @@
return expr(isInUnspecifiedPointerContext(expr(ignoringImpCasts(
unaryOperator(hasOperatorName("&"),
hasUnaryOperand(arraySubscriptExpr(
- hasBase(ignoringParenImpCasts(declRefExpr())))))
+ hasBase(ignoringParenImpCasts(declRefExpr(
+ toSupportedVariable()))))))
.bind(UPCAddressofArraySubscriptTag)))));
}
@@ -961,7 +969,8 @@
// things right.
return stmt(isInUnspecifiedPointerContext(expr(ignoringImpCasts(
unaryOperator(isPreInc(),
- hasUnaryOperand(declRefExpr())
+ hasUnaryOperand(declRefExpr(
+ toSupportedVariable()))
).bind(UPCPreIncrementTag)))));
}
@@ -999,7 +1008,8 @@
static Matcher matcher() {
// clang-format off
auto ThePtr = expr(hasPointerType(),
- ignoringImpCasts(declRefExpr(to(varDecl())).bind(BaseDeclRefExprTag)));
+ ignoringImpCasts(declRefExpr(toSupportedVariable()).
+ bind(BaseDeclRefExprTag)));
auto PlusOverPtrAndInteger = expr(anyOf(
binaryOperator(hasOperatorName("+"), hasLHS(ThePtr),
hasRHS(integerLiteral().bind(OffsetTag)))
@@ -1106,7 +1116,7 @@
// In parallel, match all DeclRefExprs so that to find out
// whether there are any uncovered by gadgets.
declRefExpr(anyOf(hasPointerType(), hasArrayType()),
- to(varDecl())).bind("any_dre"),
+ to(anyOf(varDecl(), bindingDecl()))).bind("any_dre"),
// Also match DeclStmts because we'll need them when fixing
// their underlying VarDecls that otherwise don't have
// any backreferences to DeclStmts.
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
