From fbd753ca3e4adbd54bb834fad494a34558dd3568 Mon Sep 17 00:00:00 2001
From: clc5q <clc5q@git.zephyr-software.com>
Date: Wed, 30 Dec 2015 21:23:06 +0000
Subject: [PATCH] Make static container a private member to fix STARSxrefs
output.
Former-commit-id: d9155a035bb03d985d62903e14eb659b6d8fbbfa
---
include/base/SMPFunction.h | 1 +
src/base/SMPFunction.cpp | 1 -
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/base/SMPFunction.h b/include/base/SMPFunction.h
index 69d5a5aa..35355772 100644
--- a/include/base/SMPFunction.h
+++ b/include/base/SMPFunction.h
@@ -537,6 +537,7 @@ private:
std::set<STARS_ea_t> AllCallSites; // instructions that call this function
std::set<STARS_ea_t> TailReturnTargets; // tail call return points from this function; subset of ReturnTargets
std::set<STARS_ea_t> ReturnTargets; // instructions that this function could return to
+ std::set<SMPFunction *> UnresolvedCallers; // temp set to resolve during ComputeReturnTargets()
std::map<STARS_ea_t, int> JumpFollowNodesMap; // map COND_BRANCH addresses to their follow nodes when exiting if-then-elsif-else structures
std::map<STARS_ea_t, SMPBasicBlock *> InstBlockMap;
std::vector<SMPBasicBlock *> RPOBlocks;
diff --git a/src/base/SMPFunction.cpp b/src/base/SMPFunction.cpp
index 04848a33..6ad05119 100644
--- a/src/base/SMPFunction.cpp
+++ b/src/base/SMPFunction.cpp
@@ -9139,7 +9139,6 @@ bool SMPFunction::FindShadowingPoint(const STARS_ea_t ShadowCheckAddr, const STA
// Determine inst ID set that func could return to, including tail call issues; return true if set changes
bool SMPFunction::ComputeReturnTargets(bool FirstIteration) {
bool changed = false;
- static set<SMPFunction *> UnresolvedCallers;
if ((!(this->FuncReturnsToCaller())) || this->IsLinkerStub()) {
this->ReturnTargetsComputed = true;
}
--
GitLab