vabridgers created this revision.
vabridgers added reviewers: NoQ, vsavchenko, ASDenysPetrov, steakhal, martong.
Herald added subscribers: manas, dkrupp, donat.nagy, Szelethus,
mikhail.ramalho, a.sidorin, rnkovacs, szepet, baloghadamsoftware, xazax.hun,
whisperity.
vabridgers requested review of this revision.
Herald added a project: clang.
Herald added a subscriber: cfe-commits.
This change follows up on a FIXME submitted with D105974
<https://reviews.llvm.org/D105974>. This change simply let's the reference case
fall through to return a concrete 'true'
instead of a nonloc pointer of appropriate length set to NULL.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D107720
Files:
clang/lib/StaticAnalyzer/Core/SValBuilder.cpp
Index: clang/lib/StaticAnalyzer/Core/SValBuilder.cpp
===================================================================
--- clang/lib/StaticAnalyzer/Core/SValBuilder.cpp
+++ clang/lib/StaticAnalyzer/Core/SValBuilder.cpp
@@ -725,16 +725,12 @@
// This change is needed for architectures with varying
// pointer widths. See the amdgcn opencl reproducer with
// this change as an example: solver-sym-simplification-ptr-bool.cl
- // FIXME: We could encounter a reference here,
- // try returning a concrete 'true' since it might
- // be easier on the solver.
// FIXME: Cleanup remainder of `getZeroWithPtrWidth ()`
// and `getIntWithPtrWidth()` functions to prevent future
// confusion
- const llvm::APSInt &Zero = Ty->isReferenceType()
- ? BasicVals.getZeroWithPtrWidth()
- : BasicVals.getZeroWithTypeSize(Ty);
- return makeNonLoc(Sym, BO_NE, Zero, CastTy);
+ if (!Ty->isReferenceType())
+ return makeNonLoc(Sym, BO_NE, BasicVals.getZeroWithTypeSize(Ty),
+ CastTy);
}
// Non-symbolic memory regions are always true.
return makeTruthVal(true, CastTy);
Index: clang/lib/StaticAnalyzer/Core/SValBuilder.cpp
===================================================================
--- clang/lib/StaticAnalyzer/Core/SValBuilder.cpp
+++ clang/lib/StaticAnalyzer/Core/SValBuilder.cpp
@@ -725,16 +725,12 @@
// This change is needed for architectures with varying
// pointer widths. See the amdgcn opencl reproducer with
// this change as an example: solver-sym-simplification-ptr-bool.cl
- // FIXME: We could encounter a reference here,
- // try returning a concrete 'true' since it might
- // be easier on the solver.
// FIXME: Cleanup remainder of `getZeroWithPtrWidth ()`
// and `getIntWithPtrWidth()` functions to prevent future
// confusion
- const llvm::APSInt &Zero = Ty->isReferenceType()
- ? BasicVals.getZeroWithPtrWidth()
- : BasicVals.getZeroWithTypeSize(Ty);
- return makeNonLoc(Sym, BO_NE, Zero, CastTy);
+ if (!Ty->isReferenceType())
+ return makeNonLoc(Sym, BO_NE, BasicVals.getZeroWithTypeSize(Ty),
+ CastTy);
}
// Non-symbolic memory regions are always true.
return makeTruthVal(true, CastTy);
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
