src/PNaClTranslator.cpp - Issue 892063002: Subzero: Manage each Cfg as a std::unique_ptr<Cfg>.

Unified Diff: src/PNaClTranslator.cpp

Issue 892063002: Subzero: Manage each Cfg as a std::unique_ptr<Cfg>. (Closed) Base URL: https://chromium.googlesource.com/native_client/pnacl-subzero.git@master

Patch Set: Code review updates Created 5 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: src/PNaClTranslator.cpp

diff --git a/src/PNaClTranslator.cpp b/src/PNaClTranslator.cpp

index 0c0623112e89dcf5839e4220406c07ef98edd2f7..fe7c50585678adc12e9ddaeed4bcafc8d28efde8 100644

--- a/src/PNaClTranslator.cpp

+++ b/src/PNaClTranslator.cpp

@@ -1090,7 +1090,7 @@ public:

const char *getBlockName() const override { return "function"; }

- Ice::Cfg *getFunc() const { return Func; }

+ const std::unique_ptr<Ice::Cfg> &getFunc() const { return Func; }

uint32_t getNumGlobalIDs() const { return CachedNumGlobalValueIDs; }

@@ -1130,7 +1130,7 @@ public:

private:

Ice::TimerMarker Timer;

// The corresponding ICE function defined by the function block.

- Ice::Cfg *Func;

+ std::unique_ptr<Ice::Cfg> Func;

// The index to the current basic block being built.

uint32_t CurrentBbIndex;

// The basic block being built.

@@ -1820,14 +1820,13 @@ private:

if (Ty == Ice::IceType_void)

return;

Ice::Variable *Var = getNextInstVar(Ty);

- CurrentNode->appendInst(Ice::InstAssign::create(Func, Var, Var));

+ CurrentNode->appendInst(Ice::InstAssign::create(Func.get(), Var, Var));

}

};

void FunctionParser::ExitBlock() {

if (isIRGenerationDisabled()) {

popTimerIfTimingEachFunction();

- delete Func;

return;

}

// Before translating, check for blocks without instructions, and

@@ -1840,7 +1839,7 @@ void FunctionParser::ExitBlock() {

StrBuf << "Basic block " << Index << " contains no instructions";

Error(StrBuf.str());

// TODO(kschimpf) Remove error recovery once implementation complete.

- Node->appendInst(Ice::InstUnreachable::create(Func));

+ Node->appendInst(Ice::InstUnreachable::create(Func.get()));

}

++Index;

}

@@ -1853,8 +1852,12 @@ void FunctionParser::ExitBlock() {

// translation of all remaining functions. This allows use to see

// multiple errors, without adding extra checks to the translator

// for such parsing errors.

- if (Context->getNumErrors() == 0)

- getTranslator().translateFcn(Func);

+ if (Context->getNumErrors() == 0) {

+ getTranslator().translateFcn(std::move(Func));

+ // The translator now has ownership of Func.

+ } else {

+ Func.reset();

JF 2015/02/02 20:59:19 This currently does updateTLS(nullptr). Is that ba

Jim Stichnoth 2015/02/03 00:48:51 Done.

+ }

}

void FunctionParser::ReportInvalidBinaryOp(Ice::InstArithmetic::OpKind Op,

@@ -1930,7 +1933,7 @@ void FunctionParser::ProcessRecord() {

return;

}

CurrentNode->appendInst(Ice::InstArithmetic::create(

- Func, Opcode, getNextInstVar(Type1), Op1, Op2));

+ Func.get(), Opcode, getNextInstVar(Type1), Op1, Op2));

return;

}

case naclbitc::FUNC_CODE_INST_CAST: {

@@ -1949,8 +1952,8 @@ void FunctionParser::ProcessRecord() {

appendErrorInstruction(CastType);

return;

}

- CurrentNode->appendInst(

- Ice::InstCast::create(Func, CastKind, getNextInstVar(CastType), Src));

+ CurrentNode->appendInst(Ice::InstCast::create(

+ Func.get(), CastKind, getNextInstVar(CastType), Src));

return;

}

case naclbitc::FUNC_CODE_INST_VSELECT: {

@@ -1999,7 +2002,7 @@ void FunctionParser::ProcessRecord() {

return;

}

CurrentNode->appendInst(Ice::InstSelect::create(

- Func, getNextInstVar(ThenType), CondVal, ThenVal, ElseVal));

+ Func.get(), getNextInstVar(ThenType), CondVal, ThenVal, ElseVal));

return;

}

case naclbitc::FUNC_CODE_INST_EXTRACTELT: {

@@ -2026,7 +2029,7 @@ void FunctionParser::ProcessRecord() {

return;

}

CurrentNode->appendInst(Ice::InstExtractElement::create(

- Func, getNextInstVar(typeElementType(VecType)), Vec, Index));

+ Func.get(), getNextInstVar(typeElementType(VecType)), Vec, Index));

return;

}

case naclbitc::FUNC_CODE_INST_INSERTELT: {

@@ -2055,7 +2058,7 @@ void FunctionParser::ProcessRecord() {

return;

}

CurrentNode->appendInst(Ice::InstInsertElement::create(

- Func, getNextInstVar(VecType), Vec, Elt, Index));

+ Func.get(), getNextInstVar(VecType), Vec, Elt, Index));

return;

}

case naclbitc::FUNC_CODE_INST_CMP2: {

@@ -2100,7 +2103,7 @@ void FunctionParser::ProcessRecord() {

appendErrorInstruction(DestType);

}

CurrentNode->appendInst(

- Ice::InstIcmp::create(Func, Cond, Dest, Op1, Op2));

+ Ice::InstIcmp::create(Func.get(), Cond, Dest, Op1, Op2));

} else if (isFloatingType(Op1Type)) {

Ice::InstFcmp::FCond Cond;

if (!convertNaClBitcFCompOpToIce(Values[2], Cond)) {

@@ -2112,7 +2115,7 @@ void FunctionParser::ProcessRecord() {

appendErrorInstruction(DestType);

}

CurrentNode->appendInst(

- Ice::InstFcmp::create(Func, Cond, Dest, Op1, Op2));

+ Ice::InstFcmp::create(Func.get(), Cond, Dest, Op1, Op2));

} else {

// Not sure this can happen, but be safe.

std::string Buffer;

@@ -2131,14 +2134,14 @@ void FunctionParser::ProcessRecord() {

if (Values.empty()) {

if (isIRGenerationDisabled())

return;

- CurrentNode->appendInst(Ice::InstRet::create(Func));

+ CurrentNode->appendInst(Ice::InstRet::create(Func.get()));

} else {

Ice::Operand *RetVal = getRelativeOperand(Values[0], BaseIndex);

if (isIRGenerationDisabled()) {

assert(RetVal == nullptr);

return;

}

- CurrentNode->appendInst(Ice::InstRet::create(Func, RetVal));

+ CurrentNode->appendInst(Ice::InstRet::create(Func.get(), RetVal));

}

InstIsTerminating = true;

return;

@@ -2151,7 +2154,7 @@ void FunctionParser::ProcessRecord() {

Ice::CfgNode *Block = getBranchBasicBlock(Values[0]);

if (Block == nullptr)

return;

- CurrentNode->appendInst(Ice::InstBr::create(Func, Block));

+ CurrentNode->appendInst(Ice::InstBr::create(Func.get(), Block));

} else {

// BR: [bb#, bb#, opval]

if (!isValidRecordSize(3, "branch"))

@@ -2174,7 +2177,7 @@ void FunctionParser::ProcessRecord() {

if (ThenBlock == nullptr || ElseBlock == nullptr)

return;

CurrentNode->appendInst(

- Ice::InstBr::create(Func, Cond, ThenBlock, ElseBlock));

+ Ice::InstBr::create(Func.get(), Cond, ThenBlock, ElseBlock));

}

InstIsTerminating = true;

return;

@@ -2221,8 +2224,9 @@ void FunctionParser::ProcessRecord() {

if (!isValidRecordSize(4 + NumCases * 4, "switch"))

return;

Ice::InstSwitch *Switch =

- isIRGenDisabled ? nullptr : Ice::InstSwitch::create(Func, NumCases,

- Cond, DefaultLabel);

+ isIRGenDisabled

+ ? nullptr

+ : Ice::InstSwitch::create(Func.get(), NumCases, Cond, DefaultLabel);

unsigned ValCaseIndex = 4; // index to beginning of case entry.

for (unsigned CaseIndex = 0; CaseIndex < NumCases;

++CaseIndex, ValCaseIndex += 4) {

@@ -2253,7 +2257,7 @@ void FunctionParser::ProcessRecord() {

return;

if (isIRGenerationDisabled())

return;

- CurrentNode->appendInst(Ice::InstUnreachable::create(Func));

+ CurrentNode->appendInst(Ice::InstUnreachable::create(Func.get()));

InstIsTerminating = true;

return;

}

@@ -2285,7 +2289,8 @@ void FunctionParser::ProcessRecord() {

return;

}

Ice::Variable *Dest = getNextInstVar(Ty);

- Ice::InstPhi *Phi = Ice::InstPhi::create(Func, Values.size() >> 1, Dest);

+ Ice::InstPhi *Phi =

+ Ice::InstPhi::create(Func.get(), Values.size() >> 1, Dest);

for (unsigned i = 1; i < Values.size(); i += 2) {

Ice::Operand *Op =

getRelativeOperand(NaClDecodeSignRotatedValue(Values[i]), BaseIndex);

@@ -2324,8 +2329,8 @@ void FunctionParser::ProcessRecord() {

appendErrorInstruction(PtrTy);

return;

}

- CurrentNode->appendInst(Ice::InstAlloca::create(Func, ByteCount, Alignment,

- getNextInstVar(PtrTy)));

+ CurrentNode->appendInst(Ice::InstAlloca::create(

+ Func.get(), ByteCount, Alignment, getNextInstVar(PtrTy)));

return;

}

case naclbitc::FUNC_CODE_INST_LOAD: {

@@ -2349,8 +2354,8 @@ void FunctionParser::ProcessRecord() {

appendErrorInstruction(Ty);

return;

}

- CurrentNode->appendInst(

- Ice::InstLoad::create(Func, getNextInstVar(Ty), Address, Alignment));

+ CurrentNode->appendInst(Ice::InstLoad::create(

+ Func.get(), getNextInstVar(Ty), Address, Alignment));

return;

}

case naclbitc::FUNC_CODE_INST_STORE: {

@@ -2370,7 +2375,7 @@ void FunctionParser::ProcessRecord() {

if (!isValidLoadStoreAlignment(Alignment, Value->getType(), "Store"))

return;

CurrentNode->appendInst(

- Ice::InstStore::create(Func, Value, Address, Alignment));

+ Ice::InstStore::create(Func.get(), Value, Address, Alignment));

return;

}

case naclbitc::FUNC_CODE_INST_CALL:

@@ -2459,10 +2464,11 @@ void FunctionParser::ProcessRecord() {

: getNextInstVar(ReturnType);

Ice::InstCall *Inst = nullptr;

if (IntrinsicInfo) {

- Inst = Ice::InstIntrinsicCall::create(Func, NumParams, Dest, Callee,

+ Inst = Ice::InstIntrinsicCall::create(Func.get(), NumParams, Dest, Callee,

IntrinsicInfo->Info);

} else {

- Inst = Ice::InstCall::create(Func, NumParams, Dest, Callee, IsTailCall);

+ Inst = Ice::InstCall::create(Func.get(), NumParams, Dest, Callee,

+ IsTailCall);

}

// Add parameters.

@@ -2703,7 +2709,7 @@ void FunctionValuesymtabParser::setValueName(uint64_t Index, StringType &Name) {

if (Ice::Variable *V = dyn_cast<Ice::Variable>(Op)) {

if (ALLOW_DUMP) {

std::string Nm(Name.data(), Name.size());

- V->setName(getFunctionParser()->getFunc(), Nm);

+ V->setName(getFunctionParser()->getFunc().get(), Nm);

}

} else {

reportUnableToAssign("variable", Index, Name);

« src/IceTranslator.cpp ('K') | « src/IceTranslator.cpp ('k') | no next file » | no next file with comments »