From 99c2030f917a76b792848e37d635067c902f96b2 Mon Sep 17 00:00:00 2001 From: Zhongxing Xu Date: Sun, 28 Jun 2009 14:16:39 +0000 Subject: [PATCH] Adjust retrieve handler priority. If a field is of array type, it should be handled by RetrieveArray(). git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@74409 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Analysis/RegionStore.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/Analysis/RegionStore.cpp b/lib/Analysis/RegionStore.cpp index 65864196c7..493f14d499 100644 --- a/lib/Analysis/RegionStore.cpp +++ b/lib/Analysis/RegionStore.cpp @@ -822,12 +822,6 @@ SVal RegionStoreManager::Retrieve(const GRState *state, Loc L, QualType T) { const TypedRegion *R = cast(MR); assert(R && "bad region"); - if (const FieldRegion* FR = dyn_cast(R)) - return RetrieveField(state, FR); - - if (const ElementRegion* ER = dyn_cast(R)) - return RetrieveElement(state, ER); - // FIXME: We should eventually handle funny addressing. e.g.: // // int x = ...; @@ -848,6 +842,12 @@ SVal RegionStoreManager::Retrieve(const GRState *state, Loc L, QualType T) { // FIXME: handle Vector types. if (RTy->isVectorType()) return UnknownVal(); + + if (const FieldRegion* FR = dyn_cast(R)) + return RetrieveField(state, FR); + + if (const ElementRegion* ER = dyn_cast(R)) + return RetrieveElement(state, ER); RegionBindingsTy B = GetRegionBindings(state->getStore()); RegionBindingsTy::data_type* V = B.lookup(R); -- 2.40.0