RPCSX/llvm
1
0
Fork 0
mirror of https://github.com/RPCSX/llvm.git synced 2025-01-19 02:42:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Eliminate using declarations

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@6179 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2003-05-13 21:37:02 +00:00
parent 8166e6eef6
commit 9bc02a4deb
1 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
lib/VMCore/Constants.cpp
View File

@ -1,4 +1,4 @@
//===-- Constants.cpp - Implement Constant nodes -----------------*- C++ -*--=// //===-- Constants.cpp - Implement Constant nodes --------------------------===//
// //
// This file implements the Constant* classes... // This file implements the Constant* classes...
// //
@ -13,11 +13,6 @@
#include "Support/StringExtras.h" #include "Support/StringExtras.h"
#include <algorithm> #include <algorithm>
using std::map;
using std::pair;
using std::make_pair;
using std::vector;
ConstantBool *ConstantBool::True = new ConstantBool(true); ConstantBool *ConstantBool::True = new ConstantBool(true);
ConstantBool *ConstantBool::False = new ConstantBool(false); ConstantBool *ConstantBool::False = new ConstantBool(false);
@ -462,22 +457,22 @@ void ConstantExpr::replaceUsesOfWithOnConstant(Value *From, Value *To) {
template<class ValType, class ConstantClass> template<class ValType, class ConstantClass>
struct ValueMap { struct ValueMap {
typedef pair<const Type*, ValType> ConstHashKey; typedef std::pair<const Type*, ValType> ConstHashKey;
map<ConstHashKey, ConstantClass *> Map; std::map<ConstHashKey, ConstantClass *> Map;
inline ConstantClass *get(const Type *Ty, ValType V) { inline ConstantClass *get(const Type *Ty, ValType V) {
typename map<ConstHashKey,ConstantClass *>::iterator I = typename std::map<ConstHashKey,ConstantClass *>::iterator I =
Map.find(ConstHashKey(Ty, V)); Map.find(ConstHashKey(Ty, V));
return (I != Map.end()) ? I->second : 0; return (I != Map.end()) ? I->second : 0;
} }
inline void add(const Type *Ty, ValType V, ConstantClass *CP) { inline void add(const Type *Ty, ValType V, ConstantClass *CP) {
Map.insert(make_pair(ConstHashKey(Ty, V), CP)); Map.insert(std::make_pair(ConstHashKey(Ty, V), CP));
} }
inline void remove(ConstantClass *CP) { inline void remove(ConstantClass *CP) {
for (typename map<ConstHashKey,ConstantClass *>::iterator I = Map.begin(), for (typename std::map<ConstHashKey, ConstantClass*>::iterator
E = Map.end(); I != E;++I) I = Map.begin(), E = Map.end(); I != E; ++I)
if (I->second == CP) { if (I->second == CP) {
Map.erase(I); Map.erase(I);
return; return;
@ -633,7 +628,7 @@ void ConstantPointerRef::destroyConstant() {
//---- ConstantExpr::get() implementations... //---- ConstantExpr::get() implementations...
// //
typedef pair<unsigned, vector<Constant*> > ExprMapKeyType; typedef std::pair<unsigned, std::vector<Constant*> > ExprMapKeyType;
static ValueMap<const ExprMapKeyType, ConstantExpr> ExprConstants; static ValueMap<const ExprMapKeyType, ConstantExpr> ExprConstants;
Constant *ConstantExpr::getCast(Constant *C, const Type *Ty) { Constant *ConstantExpr::getCast(Constant *C, const Type *Ty) {
@ -641,8 +636,8 @@ Constant *ConstantExpr::getCast(Constant *C, const Type *Ty) {
return FC; // Fold a few common cases... return FC; // Fold a few common cases...
// Look up the constant in the table first to ensure uniqueness // Look up the constant in the table first to ensure uniqueness
vector<Constant*> argVec(1, C); std::vector<Constant*> argVec(1, C);
const ExprMapKeyType &Key = make_pair(Instruction::Cast, argVec); const ExprMapKeyType &Key = std::make_pair(Instruction::Cast, argVec);
ConstantExpr *Result = ExprConstants.get(Ty, Key); ConstantExpr *Result = ExprConstants.get(Ty, Key);
if (Result) return Result; if (Result) return Result;
@ -658,8 +653,8 @@ Constant *ConstantExpr::get(unsigned Opcode, Constant *C1, Constant *C2) {
return FC; // Fold a few common cases... return FC; // Fold a few common cases...
// Look up the constant in the table first to ensure uniqueness // Look up the constant in the table first to ensure uniqueness
vector<Constant*> argVec(1, C1); argVec.push_back(C2); std::vector<Constant*> argVec(1, C1); argVec.push_back(C2);
const ExprMapKeyType &Key = make_pair(Opcode, argVec); const ExprMapKeyType &Key = std::make_pair(Opcode, argVec);
ConstantExpr *Result = ExprConstants.get(C1->getType(), Key); ConstantExpr *Result = ExprConstants.get(C1->getType(), Key);
if (Result) return Result; if (Result) return Result;
@ -684,10 +679,10 @@ Constant *ConstantExpr::getGetElementPtr(Constant *C,
const Type *Ty = C->getType(); const Type *Ty = C->getType();
// Look up the constant in the table first to ensure uniqueness // Look up the constant in the table first to ensure uniqueness
vector<Constant*> argVec(1, C); std::vector<Constant*> argVec(1, C);
argVec.insert(argVec.end(), IdxList.begin(), IdxList.end()); argVec.insert(argVec.end(), IdxList.begin(), IdxList.end());
const ExprMapKeyType &Key = make_pair(Instruction::GetElementPtr, argVec); const ExprMapKeyType &Key = std::make_pair(Instruction::GetElementPtr,argVec);
ConstantExpr *Result = ExprConstants.get(Ty, Key); ConstantExpr *Result = ExprConstants.get(Ty, Key);
if (Result) return Result; if (Result) return Result;