mboehme created this revision.
Herald added subscribers: martong, xazax.hun.
Herald added a reviewer: NoQ.
Herald added a project: All.
mboehme requested review of this revision.
Herald added a project: clang.
Herald added a subscriber: cfe-commits.
This parameter was already a no-op, so removing it doesn't change behavior.
Depends On D149144 <https://reviews.llvm.org/D149144>
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D149151
Files:
clang/include/clang/Analysis/FlowSensitive/DataflowEnvironment.h
clang/lib/Analysis/FlowSensitive/DataflowEnvironment.cpp
clang/lib/Analysis/FlowSensitive/Transfer.cpp
clang/unittests/Analysis/FlowSensitive/DataflowEnvironmentTest.cpp
clang/unittests/Analysis/FlowSensitive/SignAnalysisTest.cpp
clang/unittests/Analysis/FlowSensitive/TransferTest.cpp
clang/unittests/Analysis/FlowSensitive/TypeErasedDataflowAnalysisTest.cpp
Index: clang/unittests/Analysis/FlowSensitive/TypeErasedDataflowAnalysisTest.cpp
===================================================================
--- clang/unittests/Analysis/FlowSensitive/TypeErasedDataflowAnalysisTest.cpp
+++ clang/unittests/Analysis/FlowSensitive/TypeErasedDataflowAnalysisTest.cpp
@@ -723,8 +723,8 @@
const ValueDecl *BarDecl = findValueDecl(ASTCtx, "Bar");
ASSERT_THAT(BarDecl, NotNull());
- const auto *FooLoc = cast<ScalarStorageLocation>(
- Env.getStorageLocation(*FooDecl, SkipPast::None));
+ const auto *FooLoc =
+ cast<ScalarStorageLocation>(Env.getStorageLocation(*FooDecl));
const auto *BarVal =
cast<PointerValue>(Env.getValue(*BarDecl, SkipPast::None));
EXPECT_EQ(&BarVal->getPointeeLoc(), FooLoc);
Index: clang/unittests/Analysis/FlowSensitive/TransferTest.cpp
===================================================================
--- clang/unittests/Analysis/FlowSensitive/TransferTest.cpp
+++ clang/unittests/Analysis/FlowSensitive/TransferTest.cpp
@@ -98,7 +98,7 @@
const ValueDecl *FooDecl = findValueDecl(ASTCtx, "Foo");
ASSERT_THAT(FooDecl, NotNull());
- EXPECT_EQ(Env.getStorageLocation(*FooDecl, SkipPast::None), nullptr);
+ EXPECT_EQ(Env.getStorageLocation(*FooDecl), nullptr);
},
LangStandard::lang_cxx17,
/*ApplyBuiltinTransfer=*/false);
@@ -121,8 +121,7 @@
const ValueDecl *FooDecl = findValueDecl(ASTCtx, "Foo");
ASSERT_THAT(FooDecl, NotNull());
- const StorageLocation *FooLoc =
- Env.getStorageLocation(*FooDecl, SkipPast::None);
+ const StorageLocation *FooLoc = Env.getStorageLocation(*FooDecl);
ASSERT_TRUE(isa_and_nonnull<ScalarStorageLocation>(FooLoc));
const Value *FooVal = Env.getValue(*FooLoc);
@@ -147,8 +146,7 @@
const ValueDecl *FooDecl = findValueDecl(ASTCtx, "Foo");
ASSERT_THAT(FooDecl, NotNull());
- const StorageLocation *FooLoc =
- Env.getStorageLocation(*FooDecl, SkipPast::None);
+ const StorageLocation *FooLoc = Env.getStorageLocation(*FooDecl);
ASSERT_TRUE(isa_and_nonnull<ScalarStorageLocation>(FooLoc));
const Value *FooVal = Env.getValue(*FooLoc);
@@ -227,8 +225,8 @@
}
ASSERT_THAT(UnmodeledDecl, NotNull());
- const auto *FooLoc = cast<AggregateStorageLocation>(
- Env.getStorageLocation(*FooDecl, SkipPast::None));
+ const auto *FooLoc =
+ cast<AggregateStorageLocation>(Env.getStorageLocation(*FooDecl));
const auto *UnmodeledLoc = &FooLoc->getChild(*UnmodeledDecl);
ASSERT_TRUE(isa<ScalarStorageLocation>(UnmodeledLoc));
ASSERT_THAT(Env.getValue(*UnmodeledLoc), IsNull());
@@ -274,8 +272,8 @@
}
ASSERT_THAT(BarDecl, NotNull());
- const auto *FooLoc = cast<AggregateStorageLocation>(
- Env.getStorageLocation(*FooDecl, SkipPast::None));
+ const auto *FooLoc =
+ cast<AggregateStorageLocation>(Env.getStorageLocation(*FooDecl));
const auto *BarLoc =
cast<ScalarStorageLocation>(&FooLoc->getChild(*BarDecl));
@@ -322,8 +320,8 @@
}
ASSERT_THAT(BarDecl, NotNull());
- const auto *FooLoc = cast<AggregateStorageLocation>(
- Env.getStorageLocation(*FooDecl, SkipPast::None));
+ const auto *FooLoc =
+ cast<AggregateStorageLocation>(Env.getStorageLocation(*FooDecl));
const auto *BarLoc =
cast<ScalarStorageLocation>(&FooLoc->getChild(*BarDecl));
@@ -369,8 +367,8 @@
}
ASSERT_THAT(BarDecl, NotNull());
- const auto *FooLoc = cast<AggregateStorageLocation>(
- Env.getStorageLocation(*FooDecl, SkipPast::None));
+ const auto *FooLoc =
+ cast<AggregateStorageLocation>(Env.getStorageLocation(*FooDecl));
const auto *BarLoc =
cast<ScalarStorageLocation>(&FooLoc->getChild(*BarDecl));
@@ -401,8 +399,7 @@
const ValueDecl *FooDecl = findValueDecl(ASTCtx, "Foo");
ASSERT_THAT(FooDecl, NotNull());
- const StorageLocation *FooLoc =
- Env.getStorageLocation(*FooDecl, SkipPast::None);
+ const StorageLocation *FooLoc = Env.getStorageLocation(*FooDecl);
ASSERT_TRUE(isa_and_nonnull<AggregateStorageLocation>(FooLoc));
const Value *FooReferentVal = Env.getValue(*FooLoc);
@@ -489,8 +486,8 @@
ASSERT_THAT(BazRefDecl, NotNull());
ASSERT_THAT(BazPtrDecl, NotNull());
- const auto *FooLoc = cast<AggregateStorageLocation>(
- Env.getStorageLocation(*FooDecl, SkipPast::None));
+ const auto *FooLoc =
+ cast<AggregateStorageLocation>(Env.getStorageLocation(*FooDecl));
const auto *FooReferentVal = cast<StructValue>(Env.getValue(*FooLoc));
const auto *BarVal =
@@ -545,8 +542,7 @@
const ValueDecl *FooDecl = findValueDecl(ASTCtx, "Foo");
ASSERT_THAT(FooDecl, NotNull());
- const StorageLocation *FooLoc =
- Env.getStorageLocation(*FooDecl, SkipPast::None);
+ const StorageLocation *FooLoc = Env.getStorageLocation(*FooDecl);
ASSERT_TRUE(isa_and_nonnull<ScalarStorageLocation>(FooLoc));
const PointerValue *FooVal = cast<PointerValue>(Env.getValue(*FooLoc));
@@ -650,8 +646,8 @@
ASSERT_THAT(BazRefDecl, NotNull());
ASSERT_THAT(BazPtrDecl, NotNull());
- const auto *FooLoc = cast<ScalarStorageLocation>(
- Env.getStorageLocation(*FooDecl, SkipPast::None));
+ const auto *FooLoc =
+ cast<ScalarStorageLocation>(Env.getStorageLocation(*FooDecl));
const auto *FooVal = cast<PointerValue>(Env.getValue(*FooLoc));
const auto *FooPointeeVal =
cast<StructValue>(Env.getValue(FooVal->getPointeeLoc()));
@@ -704,12 +700,10 @@
const ValueDecl *BarDecl = findValueDecl(ASTCtx, "Bar");
ASSERT_THAT(BarDecl, NotNull());
- const StorageLocation *FooLoc =
- Env.getStorageLocation(*FooDecl, SkipPast::None);
+ const StorageLocation *FooLoc = Env.getStorageLocation(*FooDecl);
ASSERT_TRUE(isa_and_nonnull<ScalarStorageLocation>(FooLoc));
- const StorageLocation *BarLoc =
- Env.getStorageLocation(*BarDecl, SkipPast::None);
+ const StorageLocation *BarLoc = Env.getStorageLocation(*BarDecl);
ASSERT_TRUE(isa_and_nonnull<ScalarStorageLocation>(BarLoc));
const Value *FooVal = Env.getValue(*FooLoc);
@@ -752,26 +746,25 @@
const Environment &Env1 = getEnvironmentAtAnnotation(Results, "p1");
- const StorageLocation *FooLoc =
- Env1.getStorageLocation(*FooDecl, SkipPast::None);
+ const StorageLocation *FooLoc = Env1.getStorageLocation(*FooDecl);
EXPECT_THAT(FooLoc, NotNull());
- EXPECT_THAT(Env1.getStorageLocation(*BarDecl, SkipPast::None), IsNull());
- EXPECT_THAT(Env1.getStorageLocation(*BazDecl, SkipPast::None), IsNull());
+ EXPECT_THAT(Env1.getStorageLocation(*BarDecl), IsNull());
+ EXPECT_THAT(Env1.getStorageLocation(*BazDecl), IsNull());
const Environment &Env2 = getEnvironmentAtAnnotation(Results, "p2");
- EXPECT_EQ(Env2.getStorageLocation(*FooDecl, SkipPast::None), FooLoc);
- EXPECT_THAT(Env2.getStorageLocation(*BarDecl, SkipPast::None), NotNull());
- EXPECT_THAT(Env2.getStorageLocation(*BazDecl, SkipPast::None), IsNull());
+ EXPECT_EQ(Env2.getStorageLocation(*FooDecl), FooLoc);
+ EXPECT_THAT(Env2.getStorageLocation(*BarDecl), NotNull());
+ EXPECT_THAT(Env2.getStorageLocation(*BazDecl), IsNull());
const Environment &Env3 = getEnvironmentAtAnnotation(Results, "p3");
- EXPECT_EQ(Env3.getStorageLocation(*FooDecl, SkipPast::None), FooLoc);
- EXPECT_THAT(Env3.getStorageLocation(*BarDecl, SkipPast::None), IsNull());
- EXPECT_THAT(Env3.getStorageLocation(*BazDecl, SkipPast::None), NotNull());
+ EXPECT_EQ(Env3.getStorageLocation(*FooDecl), FooLoc);
+ EXPECT_THAT(Env3.getStorageLocation(*BarDecl), IsNull());
+ EXPECT_THAT(Env3.getStorageLocation(*BazDecl), NotNull());
const Environment &Env4 = getEnvironmentAtAnnotation(Results, "p4");
- EXPECT_EQ(Env4.getStorageLocation(*FooDecl, SkipPast::None), FooLoc);
- EXPECT_THAT(Env4.getStorageLocation(*BarDecl, SkipPast::None), IsNull());
- EXPECT_THAT(Env4.getStorageLocation(*BazDecl, SkipPast::None), IsNull());
+ EXPECT_EQ(Env4.getStorageLocation(*FooDecl), FooLoc);
+ EXPECT_THAT(Env4.getStorageLocation(*BarDecl), IsNull());
+ EXPECT_THAT(Env4.getStorageLocation(*BazDecl), IsNull());
});
}
@@ -970,8 +963,7 @@
const ValueDecl *FooDecl = findValueDecl(ASTCtx, "Foo");
ASSERT_THAT(FooDecl, NotNull());
- const StorageLocation *FooLoc =
- Env.getStorageLocation(*FooDecl, SkipPast::None);
+ const StorageLocation *FooLoc = Env.getStorageLocation(*FooDecl);
ASSERT_TRUE(isa_and_nonnull<ScalarStorageLocation>(FooLoc));
const Value *FooVal = Env.getValue(*FooLoc);
@@ -980,8 +972,7 @@
const ValueDecl *BarDecl = findValueDecl(ASTCtx, "Bar");
ASSERT_THAT(BarDecl, NotNull());
- const StorageLocation *BarLoc =
- Env.getStorageLocation(*BarDecl, SkipPast::None);
+ const StorageLocation *BarLoc = Env.getStorageLocation(*BarDecl);
ASSERT_TRUE(isa_and_nonnull<ScalarStorageLocation>(BarLoc));
const Value *BarVal = Env.getValue(*BarLoc);
@@ -1023,8 +1014,8 @@
}
ASSERT_THAT(BarDecl, NotNull());
- const auto *FooLoc = cast<AggregateStorageLocation>(
- Env.getStorageLocation(*FooDecl, SkipPast::None));
+ const auto *FooLoc =
+ cast<AggregateStorageLocation>(Env.getStorageLocation(*FooDecl));
const auto *BarLoc =
cast<ScalarStorageLocation>(&FooLoc->getChild(*BarDecl));
@@ -1053,8 +1044,7 @@
const ValueDecl *FooDecl = findValueDecl(ASTCtx, "Foo");
ASSERT_THAT(FooDecl, NotNull());
- const StorageLocation *FooLoc =
- Env.getStorageLocation(*FooDecl, SkipPast::None);
+ const StorageLocation *FooLoc = Env.getStorageLocation(*FooDecl);
ASSERT_TRUE(isa_and_nonnull<AggregateStorageLocation>(FooLoc));
const Value *FooReferentVal = Env.getValue(*FooLoc);
@@ -1081,8 +1071,7 @@
const ValueDecl *FooDecl = findValueDecl(ASTCtx, "Foo");
ASSERT_THAT(FooDecl, NotNull());
- const StorageLocation *FooLoc =
- Env.getStorageLocation(*FooDecl, SkipPast::None);
+ const StorageLocation *FooLoc = Env.getStorageLocation(*FooDecl);
ASSERT_TRUE(isa_and_nonnull<ScalarStorageLocation>(FooLoc));
const PointerValue *FooVal = cast<PointerValue>(Env.getValue(*FooLoc));
@@ -1128,8 +1117,8 @@
}
ASSERT_THAT(BarDecl, NotNull());
- const auto *FooLoc = cast<AggregateStorageLocation>(
- Env.getStorageLocation(*FooDecl, SkipPast::None));
+ const auto *FooLoc =
+ cast<AggregateStorageLocation>(Env.getStorageLocation(*FooDecl));
const auto *FooVal = cast<StructValue>(Env.getValue(*FooLoc));
const auto *BarVal = cast<IntegerValue>(FooVal->getChild(*BarDecl));
@@ -1259,8 +1248,8 @@
ASSERT_THAT(APrivateDecl, NotNull());
ASSERT_THAT(APublicDecl, NotNull());
- const auto &FooLoc = *cast<AggregateStorageLocation>(
- Env.getStorageLocation(*FooDecl, SkipPast::None));
+ const auto &FooLoc =
+ *cast<AggregateStorageLocation>(Env.getStorageLocation(*FooDecl));
const auto &FooVal = *cast<StructValue>(Env.getValue(FooLoc));
// Note: we can't test presence of children in `FooLoc`, because
@@ -1318,8 +1307,8 @@
}
ASSERT_THAT(BarDecl, NotNull());
- const auto &FooLoc = *cast<AggregateStorageLocation>(
- Env.getStorageLocation(*FooDecl, SkipPast::None));
+ const auto &FooLoc =
+ *cast<AggregateStorageLocation>(Env.getStorageLocation(*FooDecl));
const auto &FooVal = *cast<StructValue>(Env.getValue(FooLoc));
EXPECT_THAT(FooVal.getChild(*BarDecl), NotNull());
EXPECT_EQ(Env.getValue(FooLoc.getChild(*BarDecl)), FooVal.getChild(*BarDecl));
@@ -1398,8 +1387,8 @@
}
ASSERT_THAT(BarDecl, NotNull());
- const auto *FooLoc = cast<AggregateStorageLocation>(
- Env.getStorageLocation(*FooDecl, SkipPast::None));
+ const auto *FooLoc =
+ cast<AggregateStorageLocation>(Env.getStorageLocation(*FooDecl));
const auto *FooVal = cast<StructValue>(Env.getValue(*FooLoc));
const auto *BarVal = cast<IntegerValue>(FooVal->getChild(*BarDecl));
@@ -1488,8 +1477,8 @@
}
ASSERT_THAT(BarDecl, NotNull());
- const auto *FooLoc = cast<AggregateStorageLocation>(
- Env.getStorageLocation(*FooDecl, SkipPast::None));
+ const auto *FooLoc =
+ cast<AggregateStorageLocation>(Env.getStorageLocation(*FooDecl));
const auto *FooVal = cast<StructValue>(Env.getValue(*FooLoc));
const auto *BarVal = cast<ReferenceValue>(FooVal->getChild(*BarDecl));
const auto *BarReferentVal =
@@ -1930,8 +1919,8 @@
const ValueDecl *BarDecl = findValueDecl(ASTCtx, "Bar");
ASSERT_THAT(BarDecl, NotNull());
- const auto *FooLoc = cast<AggregateStorageLocation>(
- Env.getStorageLocation(*FooDecl, SkipPast::None));
+ const auto *FooLoc =
+ cast<AggregateStorageLocation>(Env.getStorageLocation(*FooDecl));
const auto *BarLoc =
cast<ScalarStorageLocation>(&FooLoc->getChild(*BarDecl));
@@ -1968,8 +1957,8 @@
const ValueDecl *BarDecl = findValueDecl(ASTCtx, "Bar");
ASSERT_THAT(BarDecl, NotNull());
- const auto *FooLoc = cast<AggregateStorageLocation>(
- Env.getStorageLocation(*FooDecl, SkipPast::None));
+ const auto *FooLoc =
+ cast<AggregateStorageLocation>(Env.getStorageLocation(*FooDecl));
const auto *BarLoc =
cast<ScalarStorageLocation>(&FooLoc->getChild(*BarDecl));
@@ -2012,10 +2001,10 @@
const ValueDecl *BazDecl = findValueDecl(ASTCtx, "Baz");
ASSERT_THAT(BazDecl, NotNull());
- const auto *FooLoc1 = cast<AggregateStorageLocation>(
- Env1.getStorageLocation(*FooDecl, SkipPast::None));
- const auto *BarLoc1 = cast<AggregateStorageLocation>(
- Env1.getStorageLocation(*BarDecl, SkipPast::None));
+ const auto *FooLoc1 =
+ cast<AggregateStorageLocation>(Env1.getStorageLocation(*FooDecl));
+ const auto *BarLoc1 =
+ cast<AggregateStorageLocation>(Env1.getStorageLocation(*BarDecl));
const auto *FooVal1 = cast<StructValue>(Env1.getValue(*FooLoc1));
const auto *BarVal1 = cast<StructValue>(Env1.getValue(*BarLoc1));
@@ -2027,10 +2016,10 @@
cast<IntegerValue>(Env1.getValue(BarLoc1->getChild(*BazDecl)));
EXPECT_NE(FooBazVal1, BarBazVal1);
- const auto *FooLoc2 = cast<AggregateStorageLocation>(
- Env2.getStorageLocation(*FooDecl, SkipPast::None));
- const auto *BarLoc2 = cast<AggregateStorageLocation>(
- Env2.getStorageLocation(*BarDecl, SkipPast::None));
+ const auto *FooLoc2 =
+ cast<AggregateStorageLocation>(Env2.getStorageLocation(*FooDecl));
+ const auto *BarLoc2 =
+ cast<AggregateStorageLocation>(Env2.getStorageLocation(*BarDecl));
const auto *FooVal2 = cast<StructValue>(Env2.getValue(*FooLoc2));
const auto *BarVal2 = cast<StructValue>(Env2.getValue(*BarLoc2));
@@ -2073,10 +2062,10 @@
const ValueDecl *BazDecl = findValueDecl(ASTCtx, "Baz");
ASSERT_THAT(BazDecl, NotNull());
- const auto *FooLoc = cast<AggregateStorageLocation>(
- Env.getStorageLocation(*FooDecl, SkipPast::None));
- const auto *BarLoc = cast<AggregateStorageLocation>(
- Env.getStorageLocation(*BarDecl, SkipPast::None));
+ const auto *FooLoc =
+ cast<AggregateStorageLocation>(Env.getStorageLocation(*FooDecl));
+ const auto *BarLoc =
+ cast<AggregateStorageLocation>(Env.getStorageLocation(*BarDecl));
const auto *FooVal = cast<StructValue>(Env.getValue(*FooLoc));
const auto *BarVal = cast<StructValue>(Env.getValue(*BarLoc));
@@ -2121,10 +2110,10 @@
const ValueDecl *BazDecl = findValueDecl(ASTCtx, "Baz");
ASSERT_THAT(BazDecl, NotNull());
- const auto *FooLoc = cast<AggregateStorageLocation>(
- Env.getStorageLocation(*FooDecl, SkipPast::None));
- const auto *BarLoc = cast<AggregateStorageLocation>(
- Env.getStorageLocation(*BarDecl, SkipPast::None));
+ const auto *FooLoc =
+ cast<AggregateStorageLocation>(Env.getStorageLocation(*FooDecl));
+ const auto *BarLoc =
+ cast<AggregateStorageLocation>(Env.getStorageLocation(*BarDecl));
const auto *FooVal = cast<StructValue>(Env.getValue(*FooLoc));
const auto *BarVal = cast<StructValue>(Env.getValue(*BarLoc));
@@ -2167,10 +2156,10 @@
const ValueDecl *BazDecl = findValueDecl(ASTCtx, "Baz");
ASSERT_THAT(BazDecl, NotNull());
- const auto *FooLoc = cast<AggregateStorageLocation>(
- Env.getStorageLocation(*FooDecl, SkipPast::None));
- const auto *BarLoc = cast<AggregateStorageLocation>(
- Env.getStorageLocation(*BarDecl, SkipPast::None));
+ const auto *FooLoc =
+ cast<AggregateStorageLocation>(Env.getStorageLocation(*FooDecl));
+ const auto *BarLoc =
+ cast<AggregateStorageLocation>(Env.getStorageLocation(*BarDecl));
const auto *FooVal = cast<StructValue>(Env.getValue(*FooLoc));
const auto *BarVal = cast<StructValue>(Env.getValue(*BarLoc));
@@ -2230,10 +2219,10 @@
const ValueDecl *BazDecl = findValueDecl(ASTCtx, "Baz");
ASSERT_THAT(BazDecl, NotNull());
- const auto *FooLoc1 = cast<AggregateStorageLocation>(
- Env1.getStorageLocation(*FooDecl, SkipPast::None));
- const auto *BarLoc1 = cast<AggregateStorageLocation>(
- Env1.getStorageLocation(*BarDecl, SkipPast::None));
+ const auto *FooLoc1 =
+ cast<AggregateStorageLocation>(Env1.getStorageLocation(*FooDecl));
+ const auto *BarLoc1 =
+ cast<AggregateStorageLocation>(Env1.getStorageLocation(*BarDecl));
const auto *FooVal1 = cast<StructValue>(Env1.getValue(*FooLoc1));
const auto *BarVal1 = cast<StructValue>(Env1.getValue(*BarLoc1));
@@ -2245,8 +2234,8 @@
cast<IntegerValue>(Env1.getValue(BarLoc1->getChild(*BazDecl)));
EXPECT_NE(FooBazVal1, BarBazVal1);
- const auto *FooLoc2 = cast<AggregateStorageLocation>(
- Env2.getStorageLocation(*FooDecl, SkipPast::None));
+ const auto *FooLoc2 =
+ cast<AggregateStorageLocation>(Env2.getStorageLocation(*FooDecl));
const auto *FooVal2 = cast<StructValue>(Env2.getValue(*FooLoc2));
EXPECT_EQ(FooVal2, BarVal1);
@@ -2522,8 +2511,8 @@
const ValueDecl *BarDecl = findValueDecl(ASTCtx, "Bar");
ASSERT_THAT(BarDecl, NotNull());
- const auto *FooLoc = cast<ScalarStorageLocation>(
- Env.getStorageLocation(*FooDecl, SkipPast::None));
+ const auto *FooLoc =
+ cast<ScalarStorageLocation>(Env.getStorageLocation(*FooDecl));
const auto *BarVal =
cast<PointerValue>(Env.getValue(*BarDecl, SkipPast::None));
EXPECT_EQ(&BarVal->getPointeeLoc(), FooLoc);
@@ -2784,7 +2773,7 @@
ASSERT_THAT(FooDecl, NotNull());
const auto *BazLoc = dyn_cast_or_null<AggregateStorageLocation>(
- Env.getStorageLocation(*BazDecl, SkipPast::None));
+ Env.getStorageLocation(*BazDecl));
ASSERT_THAT(BazLoc, NotNull());
ASSERT_THAT(Env.getValue(*BazLoc), NotNull());
@@ -2795,7 +2784,7 @@
const ValueDecl *BarDecl = findValueDecl(ASTCtx, "Bar");
ASSERT_THAT(BarDecl, NotNull());
- const auto *BarLoc = Env.getStorageLocation(*BarDecl, SkipPast::None);
+ const auto *BarLoc = Env.getStorageLocation(*BarDecl);
ASSERT_TRUE(isa_and_nonnull<ScalarStorageLocation>(BarLoc));
EXPECT_EQ(Env.getValue(*BarLoc), FooValFromBazVal);
@@ -3199,8 +3188,7 @@
const ValueDecl *FooDecl = findValueDecl(ASTCtx, "Foo");
ASSERT_THAT(FooDecl, NotNull());
- const StorageLocation *FooLoc =
- Env.getStorageLocation(*FooDecl, SkipPast::None);
+ const StorageLocation *FooLoc = Env.getStorageLocation(*FooDecl);
ASSERT_TRUE(isa_and_nonnull<ScalarStorageLocation>(FooLoc));
const Value *FooVal = Env.getValue(*FooLoc);
@@ -3229,12 +3217,10 @@
const ValueDecl *BarDecl = findValueDecl(ASTCtx, "Bar");
ASSERT_THAT(BarDecl, NotNull());
- const StorageLocation *FooLoc =
- Env.getStorageLocation(*FooDecl, SkipPast::None);
+ const StorageLocation *FooLoc = Env.getStorageLocation(*FooDecl);
ASSERT_TRUE(isa_and_nonnull<ScalarStorageLocation>(FooLoc));
- const StorageLocation *BarLoc =
- Env.getStorageLocation(*BarDecl, SkipPast::None);
+ const StorageLocation *BarLoc = Env.getStorageLocation(*BarDecl);
ASSERT_TRUE(isa_and_nonnull<ScalarStorageLocation>(BarLoc));
const Value *FooVal = Env.getValue(*FooLoc);
@@ -3649,7 +3635,7 @@
ASSERT_THAT(LVal, NotNull());
EXPECT_EQ(&LVal->getPointeeLoc(),
- InnerEnv.getStorageLocation(*ValDecl, SkipPast::Reference));
+ InnerEnv.getStorageLocation(*ValDecl));
// Outer.
LVal =
@@ -3659,7 +3645,7 @@
// The loop body may not have been executed, so we should not conclude
// that `l` points to `val`.
EXPECT_NE(&LVal->getPointeeLoc(),
- OuterEnv.getStorageLocation(*ValDecl, SkipPast::Reference));
+ OuterEnv.getStorageLocation(*ValDecl));
});
}
@@ -3724,23 +3710,21 @@
const ValueDecl *BoundBarRefDecl = findValueDecl(ASTCtx, "BoundBarRef");
ASSERT_THAT(BoundBarRefDecl, NotNull());
- const StorageLocation *FooRefLoc =
- Env.getStorageLocation(*FooRefDecl, SkipPast::Reference);
+ const StorageLocation *FooRefLoc = Env.getStorageLocation(*FooRefDecl);
ASSERT_THAT(FooRefLoc, NotNull());
- const StorageLocation *BarRefLoc =
- Env.getStorageLocation(*BarRefDecl, SkipPast::Reference);
+ const StorageLocation *BarRefLoc = Env.getStorageLocation(*BarRefDecl);
ASSERT_THAT(BarRefLoc, NotNull());
const Value *QuxVal = Env.getValue(*QuxDecl, SkipPast::None);
ASSERT_THAT(QuxVal, NotNull());
const StorageLocation *BoundFooRefLoc =
- Env.getStorageLocation(*BoundFooRefDecl, SkipPast::Reference);
+ Env.getStorageLocation(*BoundFooRefDecl);
EXPECT_EQ(BoundFooRefLoc, FooRefLoc);
const StorageLocation *BoundBarRefLoc =
- Env.getStorageLocation(*BoundBarRefDecl, SkipPast::Reference);
+ Env.getStorageLocation(*BoundBarRefDecl);
EXPECT_EQ(BoundBarRefLoc, BarRefLoc);
EXPECT_EQ(Env.getValue(*BoundFooRefDecl, SkipPast::Reference), QuxVal);
@@ -3785,23 +3769,21 @@
const ValueDecl *BoundBarRefDecl = findValueDecl(ASTCtx, "BoundBarRef");
ASSERT_THAT(BoundBarRefDecl, NotNull());
- const StorageLocation *FooRefLoc =
- Env.getStorageLocation(*FooRefDecl, SkipPast::Reference);
+ const StorageLocation *FooRefLoc = Env.getStorageLocation(*FooRefDecl);
ASSERT_THAT(FooRefLoc, NotNull());
- const StorageLocation *BarRefLoc =
- Env.getStorageLocation(*BarRefDecl, SkipPast::Reference);
+ const StorageLocation *BarRefLoc = Env.getStorageLocation(*BarRefDecl);
ASSERT_THAT(BarRefLoc, NotNull());
const Value *QuxVal = Env.getValue(*QuxDecl, SkipPast::None);
ASSERT_THAT(QuxVal, NotNull());
const StorageLocation *BoundFooRefLoc =
- Env.getStorageLocation(*BoundFooRefDecl, SkipPast::Reference);
+ Env.getStorageLocation(*BoundFooRefDecl);
EXPECT_EQ(BoundFooRefLoc, FooRefLoc);
const StorageLocation *BoundBarRefLoc =
- Env.getStorageLocation(*BoundBarRefDecl, SkipPast::Reference);
+ Env.getStorageLocation(*BoundBarRefDecl);
EXPECT_EQ(BoundBarRefLoc, BarRefLoc);
EXPECT_EQ(Env.getValue(*BoundFooRefDecl, SkipPast::Reference), QuxVal);
@@ -3847,23 +3829,21 @@
const ValueDecl *QuxDecl = findValueDecl(ASTCtx, "Qux");
ASSERT_THAT(QuxDecl, NotNull());
- const StorageLocation *FooRefLoc =
- Env.getStorageLocation(*FooRefDecl, SkipPast::Reference);
+ const StorageLocation *FooRefLoc = Env.getStorageLocation(*FooRefDecl);
ASSERT_THAT(FooRefLoc, NotNull());
- const StorageLocation *BarRefLoc =
- Env.getStorageLocation(*BarRefDecl, SkipPast::Reference);
+ const StorageLocation *BarRefLoc = Env.getStorageLocation(*BarRefDecl);
ASSERT_THAT(BarRefLoc, NotNull());
const Value *QuxVal = Env.getValue(*QuxDecl, SkipPast::None);
ASSERT_THAT(QuxVal, NotNull());
const StorageLocation *BoundFooLoc =
- Env.getStorageLocation(*BoundFooDecl, SkipPast::Reference);
+ Env.getStorageLocation(*BoundFooDecl);
EXPECT_NE(BoundFooLoc, FooRefLoc);
const StorageLocation *BoundBarLoc =
- Env.getStorageLocation(*BoundBarDecl, SkipPast::Reference);
+ Env.getStorageLocation(*BoundBarDecl);
EXPECT_NE(BoundBarLoc, BarRefLoc);
EXPECT_EQ(Env.getValue(*BoundFooDecl, SkipPast::Reference), QuxVal);
@@ -4057,12 +4037,10 @@
const ValueDecl *BazDecl = findValueDecl(ASTCtx, "Baz");
ASSERT_THAT(BazDecl, NotNull());
- const StorageLocation *BarLoc =
- Env.getStorageLocation(*BarDecl, SkipPast::Reference);
+ const StorageLocation *BarLoc = Env.getStorageLocation(*BarDecl);
ASSERT_THAT(BarLoc, NotNull());
- const StorageLocation *BazLoc =
- Env.getStorageLocation(*BazDecl, SkipPast::Reference);
+ const StorageLocation *BazLoc = Env.getStorageLocation(*BazDecl);
EXPECT_EQ(BazLoc, BarLoc);
});
}
Index: clang/unittests/Analysis/FlowSensitive/SignAnalysisTest.cpp
===================================================================
--- clang/unittests/Analysis/FlowSensitive/SignAnalysisTest.cpp
+++ clang/unittests/Analysis/FlowSensitive/SignAnalysisTest.cpp
@@ -88,8 +88,7 @@
LatticeTransferState &State) {
const auto *Var = M.Nodes.getNodeAs<clang::VarDecl>(kVar);
assert(Var != nullptr);
- const StorageLocation *Loc =
- State.Env.getStorageLocation(*Var, SkipPast::None);
+ const StorageLocation *Loc = State.Env.getStorageLocation(*Var);
Value *Val = State.Env.getValue(*Loc);
initUnknown(*Val, State.Env);
}
@@ -427,7 +426,7 @@
StringRef Property) {
if (!N)
return {testing::AssertionFailure() << "No node", nullptr};
- const StorageLocation *Loc = Env.getStorageLocation(*N, SkipPast::None);
+ const StorageLocation *Loc = Env.getStorageLocation(*N);
if (!isa_and_nonnull<ScalarStorageLocation>(Loc))
return {testing::AssertionFailure() << "No location", nullptr};
const Value *Val = Env.getValue(*Loc);
Index: clang/unittests/Analysis/FlowSensitive/DataflowEnvironmentTest.cpp
===================================================================
--- clang/unittests/Analysis/FlowSensitive/DataflowEnvironmentTest.cpp
+++ clang/unittests/Analysis/FlowSensitive/DataflowEnvironmentTest.cpp
@@ -218,8 +218,8 @@
// Verify the global variable is populated when we analyze `Target`.
Environment Env(DAContext, *Fun);
- const auto *GlobalLoc = cast<AggregateStorageLocation>(
- Env.getStorageLocation(*GlobalDecl, SkipPast::None));
+ const auto *GlobalLoc =
+ cast<AggregateStorageLocation>(Env.getStorageLocation(*GlobalDecl));
const auto *GlobalVal = cast<StructValue>(Env.getValue(*GlobalLoc));
const auto *BarVal = GlobalVal->getChild(*BarDecl);
ASSERT_THAT(BarVal, NotNull());
Index: clang/lib/Analysis/FlowSensitive/Transfer.cpp
===================================================================
--- clang/lib/Analysis/FlowSensitive/Transfer.cpp
+++ clang/lib/Analysis/FlowSensitive/Transfer.cpp
@@ -219,7 +219,7 @@
void VisitDeclRefExpr(const DeclRefExpr *S) {
const ValueDecl *VD = S->getDecl();
assert(VD != nullptr);
- auto *DeclLoc = Env.getStorageLocation(*VD, SkipPast::None);
+ auto *DeclLoc = Env.getStorageLocation(*VD);
if (DeclLoc == nullptr)
return;
@@ -534,7 +534,7 @@
if (auto *D = dyn_cast<VarDecl>(Member)) {
if (D->hasGlobalStorage()) {
- auto *VarDeclLoc = Env.getStorageLocation(*D, SkipPast::None);
+ auto *VarDeclLoc = Env.getStorageLocation(*D);
if (VarDeclLoc == nullptr)
return;
Index: clang/lib/Analysis/FlowSensitive/DataflowEnvironment.cpp
===================================================================
--- clang/lib/Analysis/FlowSensitive/DataflowEnvironment.cpp
+++ clang/lib/Analysis/FlowSensitive/DataflowEnvironment.cpp
@@ -258,7 +258,7 @@
DACtx->addModeledFields(Fields);
for (const VarDecl *D : Vars) {
- if (getStorageLocation(*D, SkipPast::None) != nullptr)
+ if (getStorageLocation(*D) != nullptr)
continue;
auto &Loc = createStorageLocation(D->getType().getNonReferenceType());
setStorageLocation(*D, Loc);
@@ -267,7 +267,7 @@
}
for (const FunctionDecl *FD : Funcs) {
- if (getStorageLocation(*FD, SkipPast::None) != nullptr)
+ if (getStorageLocation(*FD) != nullptr)
continue;
auto &Loc = createStorageLocation(FD->getType());
setStorageLocation(*FD, Loc);
@@ -618,10 +618,7 @@
assert(erased);
}
-StorageLocation *Environment::getStorageLocation(const ValueDecl &D,
- SkipPast SP) const {
- assert(SP != SkipPast::ReferenceThenPointer);
-
+StorageLocation *Environment::getStorageLocation(const ValueDecl &D) const {
auto It = DeclToLoc.find(&D);
if (It == DeclToLoc.end())
return nullptr;
@@ -699,7 +696,7 @@
Value *Environment::getValue(const ValueDecl &D, SkipPast SP) const {
assert(SP != SkipPast::ReferenceThenPointer);
- auto *Loc = getStorageLocation(D, SP);
+ auto *Loc = getStorageLocation(D);
if (Loc == nullptr)
return nullptr;
return getValue(*Loc);
Index: clang/include/clang/Analysis/FlowSensitive/DataflowEnvironment.h
===================================================================
--- clang/include/clang/Analysis/FlowSensitive/DataflowEnvironment.h
+++ clang/include/clang/Analysis/FlowSensitive/DataflowEnvironment.h
@@ -283,12 +283,7 @@
///
/// Note that if `D` has reference type, the storage location that is returned
/// refers directly to the referenced object, not a `ReferenceValue`.
- ///
- /// The `SP` parameter is deprecated and has no effect. In addition, it is
- /// not permitted to pass `SkipPast::ReferenceThenPointer` for this parameter.
- /// New uses of this function should use the default argument for `SP`.
- StorageLocation *getStorageLocation(const ValueDecl &D,
- SkipPast SP = SkipPast::None) const;
+ StorageLocation *getStorageLocation(const ValueDecl &D) const;
/// Assigns `Loc` as the storage location of `E` in the environment.
///
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
