Skip to content

S
swiftshader
Commit 83ccadcf by Karl Schimpf
Options

Remove error-recovery TODO comments from bitcode parser.

The bitcode parser contained a number of TODO commments about removing error recovery once the parser was implemented. This was based on the fact that (1) pnacl-sz in the browser didn't need it, and (2) it would be trivial to remove. The advantage of leaving error recovery in is that multiple errors can be found at once. It turns out it isn't so easy to remove, since several methods assume that recovery can be applied, and hence do not need propagate back up an (optional) error code. Parsing backs out relatively quickly anyway, since the code exits between bitcode records anyway. BUG=None R=stichnot@chromium.org Review URL: https://codereview.chromium.org/1286513002 .
parent 992f91dd
Showing with 0 additions and 17 deletions
src/PNaClTranslator.cpp
...@@ -526,7 +526,6 @@ TopLevelParser::reportGetFunctionByIDError(NaClBcIndexSize_t ID) { ...@@ -526,7 +526,6 @@ TopLevelParser::reportGetFunctionByIDError(NaClBcIndexSize_t ID) {
<< " not allowed. Out of range. Must be less than " << " not allowed. Out of range. Must be less than "
<< FunctionDeclarationList.size(); << FunctionDeclarationList.size();
blockError(StrBuf.str()); blockError(StrBuf.str());
// TODO(kschimpf) Remove error recovery once implementation complete.
if (!FunctionDeclarationList.empty()) if (!FunctionDeclarationList.empty())
return FunctionDeclarationList[0]; return FunctionDeclarationList[0];
Fatal(); Fatal();
...@@ -540,7 +539,6 @@ TopLevelParser::reportGetGlobalVariableByIDError(NaClBcIndexSize_t Index) { ...@@ -540,7 +539,6 @@ TopLevelParser::reportGetGlobalVariableByIDError(NaClBcIndexSize_t Index) {
<< " not allowed. Out of range. Must be less than " << " not allowed. Out of range. Must be less than "
<< VariableDeclarations->size(); << VariableDeclarations->size();
blockError(StrBuf.str()); blockError(StrBuf.str());
// TODO(kschimpf) Remove error recovery once implementation complete.
if (!VariableDeclarations->empty()) if (!VariableDeclarations->empty())
return VariableDeclarations->at(0); return VariableDeclarations->at(0);
Fatal(); Fatal();
...@@ -711,7 +709,6 @@ bool BlockParserBaseClass::ParseBlock(unsigned BlockID) { ...@@ -711,7 +709,6 @@ bool BlockParserBaseClass::ParseBlock(unsigned BlockID) {
raw_string_ostream StrBuf(Buffer); raw_string_ostream StrBuf(Buffer);
StrBuf << "Don't know how to parse block id: " << BlockID; StrBuf << "Don't know how to parse block id: " << BlockID;
Error(StrBuf.str()); Error(StrBuf.str());
// TODO(kschimpf) Remove error recovery once implementation complete.
SkipBlock(); SkipBlock();
return false; return false;
} }
...@@ -917,7 +914,6 @@ void TypesParser::ProcessRecord() { ...@@ -917,7 +914,6 @@ void TypesParser::ProcessRecord() {
raw_string_ostream StrBuf(Buffer); raw_string_ostream StrBuf(Buffer);
StrBuf << "Type for parameter " << (i - 1) StrBuf << "Type for parameter " << (i - 1)
<< " not valid. Found: " << ArgTy; << " not valid. Found: " << ArgTy;
// TODO(kschimpf) Remove error recovery once implementation complete.
ArgTy = Ice::IceType_i32; ArgTy = Ice::IceType_i32;
} }
FuncTy->appendArgType(ArgTy); FuncTy->appendArgType(ArgTy);
...@@ -1397,7 +1393,6 @@ private: ...@@ -1397,7 +1393,6 @@ private:
assert(!isIRGenerationDisabled()); assert(!isIRGenerationDisabled());
if (Index == 0) { if (Index == 0) {
Error("Branch to entry block not allowed"); Error("Branch to entry block not allowed");
// TODO(kschimpf) Remove error recovery once implementation complete.
} }
return getBasicBlock(Index); return getBasicBlock(Index);
} }
...@@ -1433,7 +1428,6 @@ private: ...@@ -1433,7 +1428,6 @@ private:
StrBuf << "Illegal forward referenced instruction (" StrBuf << "Illegal forward referenced instruction ("
<< NextLocalInstIndex << "): " << *Op; << NextLocalInstIndex << "): " << *Op;
Error(StrBuf.str()); Error(StrBuf.str());
// TODO(kschimpf) Remove error recovery once implementation complete.
++NextLocalInstIndex; ++NextLocalInstIndex;
return createInstVar(Ty); return createInstVar(Ty);
} }
...@@ -1453,7 +1447,6 @@ private: ...@@ -1453,7 +1447,6 @@ private:
StrBuf << "Invalid relative value id: " << Id StrBuf << "Invalid relative value id: " << Id
<< " (must be <= " << BaseIndex << ")"; << " (must be <= " << BaseIndex << ")";
Error(StrBuf.str()); Error(StrBuf.str());
// TODO(kschimpf) Remove error recovery once implementation complete.
return 0; return 0;
} }
return BaseIndex - Id; return BaseIndex - Id;
...@@ -1482,7 +1475,6 @@ private: ...@@ -1482,7 +1475,6 @@ private:
StrBuf << "Multiple definitions for index " << Index << ": " << *Op StrBuf << "Multiple definitions for index " << Index << ": " << *Op
<< " and " << *IndexedOp; << " and " << *IndexedOp;
Error(StrBuf.str()); Error(StrBuf.str());
// TODO(kschimpf) Remove error recovery once implementation complete.
IndexedOp = Op; IndexedOp = Op;
} }
...@@ -1644,7 +1636,6 @@ private: ...@@ -1644,7 +1636,6 @@ private:
raw_string_ostream StrBuf(Buffer); raw_string_ostream StrBuf(Buffer);
StrBuf << "Binary opcode " << Opcode << "not understood for type " << Ty; StrBuf << "Binary opcode " << Opcode << "not understood for type " << Ty;
Error(StrBuf.str()); Error(StrBuf.str());
// TODO(kschimpf) Remove error recovery once implementation complete.
Op = Ice::InstArithmetic::Add; Op = Ice::InstArithmetic::Add;
return false; return false;
} }
...@@ -1813,7 +1804,6 @@ private: ...@@ -1813,7 +1804,6 @@ private:
raw_string_ostream StrBuf(Buffer); raw_string_ostream StrBuf(Buffer);
StrBuf << "Cast opcode " << Opcode << " not understood.\n"; StrBuf << "Cast opcode " << Opcode << " not understood.\n";
Error(StrBuf.str()); Error(StrBuf.str());
// TODO(kschimpf) Remove error recovery once implementation complete.
CastKind = Ice::InstCast::Bitcast; CastKind = Ice::InstCast::Bitcast;
return false; return false;
} }
...@@ -1976,7 +1966,6 @@ private: ...@@ -1976,7 +1966,6 @@ private:
// if the return type is void. In such cases, a placeholder value // if the return type is void. In such cases, a placeholder value
// for the badly formed instruction is not needed. Hence, if Ty is // for the badly formed instruction is not needed. Hence, if Ty is
// void, an error instruction is not appended. // void, an error instruction is not appended.
// TODO(kschimpf) Remove error recovery once implementation complete.
void appendErrorInstruction(Ice::Type Ty) { void appendErrorInstruction(Ice::Type Ty) {
// Note: we don't worry about downstream translation errors because // Note: we don't worry about downstream translation errors because
// the function will not be translated if any errors occur. // the function will not be translated if any errors occur.
...@@ -2069,7 +2058,6 @@ void FunctionParser::ExitBlock() { ...@@ -2069,7 +2058,6 @@ void FunctionParser::ExitBlock() {
raw_string_ostream StrBuf(Buffer); raw_string_ostream StrBuf(Buffer);
StrBuf << "Basic block " << Index << " contains no instructions"; StrBuf << "Basic block " << Index << " contains no instructions";
Error(StrBuf.str()); Error(StrBuf.str());
// TODO(kschimpf) Remove error recovery once implementation complete.
Node->appendInst(Ice::InstUnreachable::create(Func.get())); Node->appendInst(Ice::InstUnreachable::create(Func.get()));
} }
++Index; ++Index;
...@@ -2107,7 +2095,6 @@ void FunctionParser::ProcessRecord() { ...@@ -2107,7 +2095,6 @@ void FunctionParser::ProcessRecord() {
uint64_t NumBbsRaw = Values[0]; uint64_t NumBbsRaw = Values[0];
if (NumBbsRaw == 0) { if (NumBbsRaw == 0) {
Error("Functions must contain at least one basic block."); Error("Functions must contain at least one basic block.");
// TODO(kschimpf) Remove error recovery once implementation complete.
NumBbsRaw = 1; NumBbsRaw = 1;
} else if (NumBbsRaw > NaClBcIndexSize_t_Max) { } else if (NumBbsRaw > NaClBcIndexSize_t_Max) {
std::string Buffer; std::string Buffer;
...@@ -2715,7 +2702,6 @@ void FunctionParser::ProcessRecord() { ...@@ -2715,7 +2702,6 @@ void FunctionParser::ProcessRecord() {
<< IntrinsicInfo->getReturnType() << IntrinsicInfo->getReturnType()
<< ". Found: " << Inst->getReturnType(); << ". Found: " << Inst->getReturnType();
Error(StrBuf.str()); Error(StrBuf.str());
// TODO(kschimpf) Remove error recovery once implementation complete.
break; break;
} }
case Ice::Intrinsics::WrongNumOfArgs: { case Ice::Intrinsics::WrongNumOfArgs: {
...@@ -2724,7 +2710,6 @@ void FunctionParser::ProcessRecord() { ...@@ -2724,7 +2710,6 @@ void FunctionParser::ProcessRecord() {
StrBuf << "Intrinsic call expects " << IntrinsicInfo->getNumArgs() StrBuf << "Intrinsic call expects " << IntrinsicInfo->getNumArgs()
<< ". Found: " << Inst->getNumArgs(); << ". Found: " << Inst->getNumArgs();
Error(StrBuf.str()); Error(StrBuf.str());
// TODO(kschimpf) Remove error recovery once implementation complete.
break; break;
} }
case Ice::Intrinsics::WrongCallArgType: { case Ice::Intrinsics::WrongCallArgType: {
...@@ -2734,7 +2719,6 @@ void FunctionParser::ProcessRecord() { ...@@ -2734,7 +2719,6 @@ void FunctionParser::ProcessRecord() {
<< IntrinsicInfo->getArgType(ArgIndex) << IntrinsicInfo->getArgType(ArgIndex)
<< ". Found: " << Inst->getArg(ArgIndex)->getType(); << ". Found: " << Inst->getArg(ArgIndex)->getType();
Error(StrBuf.str()); Error(StrBuf.str());
// TODO(kschimpf) Remove error recovery once implementation complete.
break; break;
} }
} }
...@@ -2928,7 +2912,6 @@ void FunctionValuesymtabParser::setValueName(NaClBcIndexSize_t Index, ...@@ -2928,7 +2912,6 @@ void FunctionValuesymtabParser::setValueName(NaClBcIndexSize_t Index,
// (FP->getOperand will create fatal error). // (FP->getOperand will create fatal error).
if (Index < getFunctionParser()->getNumGlobalIDs()) { if (Index < getFunctionParser()->getNumGlobalIDs()) {
reportUnableToAssign("instruction", Index, Name); reportUnableToAssign("instruction", Index, Name);
// TODO(kschimpf) Remove error recovery once implementation complete.
return; return;
} }
if (isIRGenerationDisabled()) if (isIRGenerationDisabled())
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment