6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-08-07 12:28:24 +00:00
Code Issues Projects Releases Wiki Activity

unique_ptrify ValID::ConstantStructElts

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@231200 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
David Blaikie
2015-03-04 01:41:01 +00:00
parent de2cab9eb4
commit cca1f3743d
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/AsmParser/LLParser.cpp
View File

@@ -2365,9 +2365,10 @@ bool LLParser::ParseValID(ValID &ID, PerFunctionState *PFS) {
ParseToken(lltok::rbrace, "expected end of struct constant")) ParseToken(lltok::rbrace, "expected end of struct constant"))
return true; return true;
ID.ConstantStructElts = new Constant*[Elts.size()]; ID.ConstantStructElts.reset(new Constant *[Elts.size()]);
ID.UIntVal = Elts.size(); ID.UIntVal = Elts.size();
memcpy(ID.ConstantStructElts, Elts.data(), Elts.size()*sizeof(Elts[0])); memcpy(ID.ConstantStructElts.get(), Elts.data(),
Elts.size() * sizeof(Elts[0]));
ID.Kind = ValID::t_ConstantStruct; ID.Kind = ValID::t_ConstantStruct;
return false; return false;
} }
@@ -2386,8 +2387,9 @@ bool LLParser::ParseValID(ValID &ID, PerFunctionState *PFS) {
return true; return true;
if (isPackedStruct) { if (isPackedStruct) {
ID.ConstantStructElts = new Constant*[Elts.size()]; ID.ConstantStructElts.reset(new Constant *[Elts.size()]);
memcpy(ID.ConstantStructElts, Elts.data(), Elts.size()*sizeof(Elts[0])); memcpy(ID.ConstantStructElts.get(), Elts.data(),
Elts.size() * sizeof(Elts[0]));
ID.UIntVal = Elts.size(); ID.UIntVal = Elts.size();
ID.Kind = ValID::t_PackedConstantStruct; ID.Kind = ValID::t_PackedConstantStruct;
return false; return false;
@@ -3947,8 +3949,8 @@ bool LLParser::ConvertValIDToValue(Type *Ty, ValID &ID, Value *&V,
return Error(ID.Loc, "element " + Twine(i) + return Error(ID.Loc, "element " + Twine(i) +
" of struct initializer doesn't match struct element type"); " of struct initializer doesn't match struct element type");
V = ConstantStruct::get(ST, makeArrayRef(ID.ConstantStructElts, V = ConstantStruct::get(
ID.UIntVal)); ST, makeArrayRef(ID.ConstantStructElts.get(), ID.UIntVal));
} else } else
return Error(ID.Loc, "constant expression type mismatch"); return Error(ID.Loc, "constant expression type mismatch");
return false; return false;

6
lib/AsmParser/LLParser.h
View File

@@ -62,13 +62,9 @@ namespace llvm {
APSInt APSIntVal; APSInt APSIntVal;
APFloat APFloatVal; APFloat APFloatVal;
Constant *ConstantVal; Constant *ConstantVal;
Constant **ConstantStructElts; std::unique_ptr<Constant*[]> ConstantStructElts;
ValID() : Kind(t_LocalID), APFloatVal(0.0) {} ValID() : Kind(t_LocalID), APFloatVal(0.0) {}
~ValID() {
if (Kind == t_ConstantStruct || Kind == t_PackedConstantStruct)
delete [] ConstantStructElts;
}
bool operator<(const ValID &RHS) const { bool operator<(const ValID &RHS) const {
if (Kind == t_LocalID || Kind == t_GlobalID) if (Kind == t_LocalID || Kind == t_GlobalID)