#include "llvm/InlineAsm.h"
#include "llvm/Instructions.h"
#include "llvm/Module.h"
-#include "llvm/SymbolTable.h"
+#include "llvm/ValueSymbolTable.h"
+#include "llvm/AutoUpgrade.h"
#include "llvm/Support/GetElementPtrTypeIterator.h"
#include "llvm/Support/CommandLine.h"
+#include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/STLExtras.h"
#include "llvm/Support/MathExtras.h"
#include "llvm/Support/Streams.h"
#include <algorithm>
#include <list>
+#include <map>
#include <utility>
-#ifndef NDEBUG
-#define YYDEBUG 1
-#endif
// The following is a gross hack. In order to rid the libAsmParser library of
// exceptions, we have to have a way of getting the yyparse function to go into
int yyerror(const char *ErrorMsg); // Forward declarations to prevent "implicit
int yylex(); // declaration" of xxx warnings.
int yyparse();
-
-namespace llvm {
- std::string CurFilename;
-#if YYDEBUG
-static cl::opt<bool>
-Debug("debug-yacc", cl::desc("Print yacc debug state changes"),
- cl::Hidden, cl::init(false));
-#endif
-}
using namespace llvm;
static Module *ParserResult;
typedef std::vector<Value *> ValueList; // Numbered defs
static void
-ResolveDefinitions(std::map<const Type *,ValueList> &LateResolvers,
- std::map<const Type *,ValueList> *FutureLateResolvers = 0);
+ResolveDefinitions(ValueList &LateResolvers, ValueList *FutureLateResolvers=0);
static struct PerModuleInfo {
Module *CurrentModule;
- std::map<const Type *, ValueList> Values; // Module level numbered definitions
- std::map<const Type *,ValueList> LateResolveValues;
+ ValueList Values; // Module level numbered definitions
+ ValueList LateResolveValues;
std::vector<PATypeHolder> Types;
std::map<ValID, PATypeHolder> LateResolveTypes;
return;
}
+ // Look for intrinsic functions and CallInst that need to be upgraded
+ for (Module::iterator FI = CurrentModule->begin(),
+ FE = CurrentModule->end(); FI != FE; )
+ UpgradeCallsToIntrinsic(FI++); // must be post-increment, as we remove
+
Values.clear(); // Clear out function local definitions
Types.clear();
CurrentModule = 0;
}
return false;
}
-
-
} CurModule;
static struct PerFunctionInfo {
Function *CurrentFunction; // Pointer to current function being created
- std::map<const Type*, ValueList> Values; // Keep track of #'d definitions
- std::map<const Type*, ValueList> LateResolveValues;
- bool isDeclare; // Is this function a forward declararation?
+ ValueList Values; // Keep track of #'d definitions
+ unsigned NextValNum;
+ ValueList LateResolveValues;
+ bool isDeclare; // Is this function a forward declararation?
GlobalValue::LinkageTypes Linkage; // Linkage for forward declaration.
+ GlobalValue::VisibilityTypes Visibility;
/// BBForwardRefs - When we see forward references to basic blocks, keep
/// track of them here.
- std::map<BasicBlock*, std::pair<ValID, int> > BBForwardRefs;
- std::vector<BasicBlock*> NumberedBlocks;
- unsigned NextBBNum;
+ std::map<ValID, BasicBlock*> BBForwardRefs;
inline PerFunctionInfo() {
CurrentFunction = 0;
isDeclare = false;
- Linkage = GlobalValue::ExternalLinkage;
+ Linkage = GlobalValue::ExternalLinkage;
+ Visibility = GlobalValue::DefaultVisibility;
}
inline void FunctionStart(Function *M) {
CurrentFunction = M;
- NextBBNum = 0;
+ NextValNum = 0;
}
void FunctionDone() {
- NumberedBlocks.clear();
-
// Any forward referenced blocks left?
if (!BBForwardRefs.empty()) {
GenerateError("Undefined reference to label " +
- BBForwardRefs.begin()->first->getName());
+ BBForwardRefs.begin()->second->getName());
return;
}
ResolveDefinitions(LateResolveValues, &CurModule.LateResolveValues);
Values.clear(); // Clear out function local definitions
+ BBForwardRefs.clear();
CurrentFunction = 0;
isDeclare = false;
Linkage = GlobalValue::ExternalLinkage;
+ Visibility = GlobalValue::DefaultVisibility;
}
} CurFun; // Info for the current function...
// Code to handle definitions of all the types
//===----------------------------------------------------------------------===//
-static int InsertValue(Value *V,
- std::map<const Type*,ValueList> &ValueTab = CurFun.Values) {
- if (V->hasName()) return -1; // Is this a numbered definition?
-
- // Yes, insert the value into the value table...
- ValueList &List = ValueTab[V->getType()];
- List.push_back(V);
- return List.size()-1;
+static void InsertValue(Value *V, ValueList &ValueTab = CurFun.Values) {
+ // Things that have names or are void typed don't get slot numbers
+ if (V->hasName() || (V->getType() == Type::VoidTy))
+ return;
+
+ // In the case of function values, we have to allow for the forward reference
+ // of basic blocks, which are included in the numbering. Consequently, we keep
+ // track of the next insertion location with NextValNum. When a BB gets
+ // inserted, it could change the size of the CurFun.Values vector.
+ if (&ValueTab == &CurFun.Values) {
+ if (ValueTab.size() <= CurFun.NextValNum)
+ ValueTab.resize(CurFun.NextValNum+1);
+ ValueTab[CurFun.NextValNum++] = V;
+ return;
+ }
+ // For all other lists, its okay to just tack it on the back of the vector.
+ ValueTab.push_back(V);
}
static const Type *getTypeVal(const ValID &D, bool DoNotImprovise = false) {
switch (D.Type) {
- case ValID::NumberVal: // Is it a numbered definition?
+ case ValID::LocalID: // Is it a numbered definition?
// Module constants occupy the lowest numbered slots...
- if ((unsigned)D.Num < CurModule.Types.size())
- return CurModule.Types[(unsigned)D.Num];
+ if (D.Num < CurModule.Types.size())
+ return CurModule.Types[D.Num];
break;
- case ValID::NameVal: // Is it a named definition?
- if (const Type *N = CurModule.CurrentModule->getTypeByName(D.Name)) {
+ case ValID::LocalName: // Is it a named definition?
+ if (const Type *N = CurModule.CurrentModule->getTypeByName(D.getName())) {
D.destroy(); // Free old strdup'd memory...
return N;
}
break;
default:
- GenerateError("Internal parser error: Invalid symbol type reference!");
+ GenerateError("Internal parser error: Invalid symbol type reference");
return 0;
}
if (inFunctionScope()) {
- if (D.Type == ValID::NameVal) {
+ if (D.Type == ValID::LocalName) {
GenerateError("Reference to an undefined type: '" + D.getName() + "'");
return 0;
} else {
- GenerateError("Reference to an undefined type: #" + itostr(D.Num));
+ GenerateError("Reference to an undefined type: #" + utostr(D.Num));
return 0;
}
}
return Typ;
}
-static Value *lookupInSymbolTable(const Type *Ty, const std::string &Name) {
- SymbolTable &SymTab =
- inFunctionScope() ? CurFun.CurrentFunction->getValueSymbolTable() :
- CurModule.CurrentModule->getValueSymbolTable();
- return SymTab.lookup(Ty, Name);
-}
-
-// getValNonImprovising - Look up the value specified by the provided type and
+// getExistingVal - Look up the value specified by the provided type and
// the provided ValID. If the value exists and has already been defined, return
// it. Otherwise return null.
//
-static Value *getValNonImprovising(const Type *Ty, const ValID &D) {
+static Value *getExistingVal(const Type *Ty, const ValID &D) {
if (isa<FunctionType>(Ty)) {
GenerateError("Functions are not values and "
"must be referenced as pointers");
}
switch (D.Type) {
- case ValID::NumberVal: { // Is it a numbered definition?
- unsigned Num = (unsigned)D.Num;
-
- // Module constants occupy the lowest numbered slots...
- std::map<const Type*,ValueList>::iterator VI = CurModule.Values.find(Ty);
- if (VI != CurModule.Values.end()) {
- if (Num < VI->second.size())
- return VI->second[Num];
- Num -= VI->second.size();
+ case ValID::LocalID: { // Is it a numbered definition?
+ // Check that the number is within bounds.
+ if (D.Num >= CurFun.Values.size())
+ return 0;
+ Value *Result = CurFun.Values[D.Num];
+ if (Ty != Result->getType()) {
+ GenerateError("Numbered value (%" + utostr(D.Num) + ") of type '" +
+ Result->getType()->getDescription() + "' does not match "
+ "expected type, '" + Ty->getDescription() + "'");
+ return 0;
}
-
- // Make sure that our type is within bounds
- VI = CurFun.Values.find(Ty);
- if (VI == CurFun.Values.end()) return 0;
-
- // Check that the number is within bounds...
- if (VI->second.size() <= Num) return 0;
-
- return VI->second[Num];
+ return Result;
}
-
- case ValID::NameVal: { // Is it a named definition?
- Value *N = lookupInSymbolTable(Ty, std::string(D.Name));
- if (N == 0) return 0;
+ case ValID::GlobalID: { // Is it a numbered definition?
+ if (D.Num >= CurModule.Values.size())
+ return 0;
+ Value *Result = CurModule.Values[D.Num];
+ if (Ty != Result->getType()) {
+ GenerateError("Numbered value (@" + utostr(D.Num) + ") of type '" +
+ Result->getType()->getDescription() + "' does not match "
+ "expected type, '" + Ty->getDescription() + "'");
+ return 0;
+ }
+ return Result;
+ }
+
+ case ValID::LocalName: { // Is it a named definition?
+ if (!inFunctionScope())
+ return 0;
+ ValueSymbolTable &SymTab = CurFun.CurrentFunction->getValueSymbolTable();
+ Value *N = SymTab.lookup(D.getName());
+ if (N == 0)
+ return 0;
+ if (N->getType() != Ty)
+ return 0;
+
+ D.destroy(); // Free old strdup'd memory...
+ return N;
+ }
+ case ValID::GlobalName: { // Is it a named definition?
+ ValueSymbolTable &SymTab = CurModule.CurrentModule->getValueSymbolTable();
+ Value *N = SymTab.lookup(D.getName());
+ if (N == 0)
+ return 0;
+ if (N->getType() != Ty)
+ return 0;
D.destroy(); // Free old strdup'd memory...
return N;
if (!ConstantInt::isValueValidForType(Ty, D.ConstPool64)) {
GenerateError("Signed integral constant '" +
itostr(D.ConstPool64) + "' is invalid for type '" +
- Ty->getDescription() + "'!");
+ Ty->getDescription() + "'");
return 0;
}
- return ConstantInt::get(Ty, D.ConstPool64);
+ return ConstantInt::get(Ty, D.ConstPool64, true);
case ValID::ConstUIntVal: // Is it an unsigned const pool reference?
if (!ConstantInt::isValueValidForType(Ty, D.UConstPool64)) {
if (!ConstantInt::isValueValidForType(Ty, D.ConstPool64)) {
GenerateError("Integral constant '" + utostr(D.UConstPool64) +
- "' is invalid or out of range!");
+ "' is invalid or out of range");
return 0;
} else { // This is really a signed reference. Transmogrify.
- return ConstantInt::get(Ty, D.ConstPool64);
+ return ConstantInt::get(Ty, D.ConstPool64, true);
}
} else {
return ConstantInt::get(Ty, D.UConstPool64);
}
case ValID::ConstFPVal: // Is it a floating point const pool reference?
- if (!ConstantFP::isValueValidForType(Ty, D.ConstPoolFP)) {
- GenerateError("FP constant invalid for type!!");
+ if (!ConstantFP::isValueValidForType(Ty, *D.ConstPoolFP)) {
+ GenerateError("FP constant invalid for type");
return 0;
}
- return ConstantFP::get(Ty, D.ConstPoolFP);
+ // Lexer has no type info, so builds all float and double FP constants
+ // as double. Fix this here. Long double does not need this.
+ if (&D.ConstPoolFP->getSemantics() == &APFloat::IEEEdouble &&
+ Ty==Type::FloatTy)
+ D.ConstPoolFP->convert(APFloat::IEEEsingle, APFloat::rmNearestTiesToEven);
+ return ConstantFP::get(Ty, *D.ConstPoolFP);
case ValID::ConstNullVal: // Is it a null value?
if (!isa<PointerType>(Ty)) {
- GenerateError("Cannot create a a non pointer null!");
+ GenerateError("Cannot create a a non pointer null");
return 0;
}
return ConstantPointerNull::get(cast<PointerType>(Ty));
case ValID::ConstantVal: // Fully resolved constant?
if (D.ConstantValue->getType() != Ty) {
- GenerateError("Constant expression type different from required type!");
+ GenerateError("Constant expression type different from required type");
return 0;
}
return D.ConstantValue;
const FunctionType *FTy =
PTy ? dyn_cast<FunctionType>(PTy->getElementType()) : 0;
if (!FTy || !InlineAsm::Verify(FTy, D.IAD->Constraints)) {
- GenerateError("Invalid type for asm constraint string!");
+ GenerateError("Invalid type for asm constraint string");
return 0;
}
InlineAsm *IA = InlineAsm::get(FTy, D.IAD->AsmString, D.IAD->Constraints,
return 0;
}
-// getVal - This function is identical to getValNonImprovising, except that if a
+// getVal - This function is identical to getExistingVal, except that if a
// value is not already defined, it "improvises" by creating a placeholder var
// that looks and acts just like the requested variable. When the value is
// defined later, all uses of the placeholder variable are replaced with the
}
// See if the value has already been defined.
- Value *V = getValNonImprovising(Ty, ID);
+ Value *V = getExistingVal(Ty, ID);
if (V) return V;
if (TriggerError) return 0;
if (!Ty->isFirstClassType() && !isa<OpaqueType>(Ty)) {
- GenerateError("Invalid use of a composite type!");
+ GenerateError("Invalid use of a composite type");
return 0;
}
// or an id number that hasn't been read yet. We may be referencing something
// forward, so just create an entry to be resolved later and get to it...
//
- V = new Argument(Ty);
-
+ switch (ID.Type) {
+ case ValID::GlobalName:
+ case ValID::GlobalID: {
+ const PointerType *PTy = dyn_cast<PointerType>(Ty);
+ if (!PTy) {
+ GenerateError("Invalid type for reference to global" );
+ return 0;
+ }
+ const Type* ElTy = PTy->getElementType();
+ if (const FunctionType *FTy = dyn_cast<FunctionType>(ElTy))
+ V = new Function(FTy, GlobalValue::ExternalLinkage);
+ else
+ V = new GlobalVariable(ElTy, false, GlobalValue::ExternalLinkage, 0, "",
+ (Module*)0, false, PTy->getAddressSpace());
+ break;
+ }
+ default:
+ V = new Argument(Ty);
+ }
+
// Remember where this forward reference came from. FIXME, shouldn't we try
// to recycle these things??
CurModule.PlaceHolderInfo.insert(std::make_pair(V, std::make_pair(ID,
- llvmAsmlineno)));
+ LLLgetLineNo())));
if (inFunctionScope())
InsertValue(V, CurFun.LateResolveValues);
return V;
}
-/// getBBVal - This is used for two purposes:
-/// * If isDefinition is true, a new basic block with the specified ID is being
-/// defined.
-/// * If isDefinition is true, this is a reference to a basic block, which may
-/// or may not be a forward reference.
-///
-static BasicBlock *getBBVal(const ValID &ID, bool isDefinition = false) {
+/// defineBBVal - This is a definition of a new basic block with the specified
+/// identifier which must be the same as CurFun.NextValNum, if its numeric.
+static BasicBlock *defineBBVal(const ValID &ID) {
assert(inFunctionScope() && "Can't get basic block at global scope!");
- std::string Name;
BasicBlock *BB = 0;
- switch (ID.Type) {
- default:
- GenerateError("Illegal label reference " + ID.getName());
- return 0;
- case ValID::NumberVal: // Is it a numbered definition?
- if (unsigned(ID.Num) >= CurFun.NumberedBlocks.size())
- CurFun.NumberedBlocks.resize(ID.Num+1);
- BB = CurFun.NumberedBlocks[ID.Num];
- break;
- case ValID::NameVal: // Is it a named definition?
- Name = ID.Name;
- if (Value *N = CurFun.CurrentFunction->
- getValueSymbolTable().lookup(Type::LabelTy, Name))
- BB = cast<BasicBlock>(N);
- break;
- }
- // See if the block has already been defined.
- if (BB) {
- // If this is the definition of the block, make sure the existing value was
- // just a forward reference. If it was a forward reference, there will be
- // an entry for it in the PlaceHolderInfo map.
- if (isDefinition && !CurFun.BBForwardRefs.erase(BB)) {
- // The existing value was a definition, not a forward reference.
- GenerateError("Redefinition of label " + ID.getName());
- return 0;
+ // First, see if this was forward referenced
+
+ std::map<ValID, BasicBlock*>::iterator BBI = CurFun.BBForwardRefs.find(ID);
+ if (BBI != CurFun.BBForwardRefs.end()) {
+ BB = BBI->second;
+ // The forward declaration could have been inserted anywhere in the
+ // function: insert it into the correct place now.
+ CurFun.CurrentFunction->getBasicBlockList().remove(BB);
+ CurFun.CurrentFunction->getBasicBlockList().push_back(BB);
+
+ // We're about to erase the entry, save the key so we can clean it up.
+ ValID Tmp = BBI->first;
+
+ // Erase the forward ref from the map as its no longer "forward"
+ CurFun.BBForwardRefs.erase(ID);
+
+ // The key has been removed from the map but so we don't want to leave
+ // strdup'd memory around so destroy it too.
+ Tmp.destroy();
+
+ // If its a numbered definition, bump the number and set the BB value.
+ if (ID.Type == ValID::LocalID) {
+ assert(ID.Num == CurFun.NextValNum && "Invalid new block number");
+ InsertValue(BB);
}
- ID.destroy(); // Free strdup'd memory.
+ ID.destroy();
return BB;
+ }
+
+ // We haven't seen this BB before and its first mention is a definition.
+ // Just create it and return it.
+ std::string Name (ID.Type == ValID::LocalName ? ID.getName() : "");
+ BB = new BasicBlock(Name, CurFun.CurrentFunction);
+ if (ID.Type == ValID::LocalID) {
+ assert(ID.Num == CurFun.NextValNum && "Invalid new block number");
+ InsertValue(BB);
}
- // Otherwise this block has not been seen before.
- BB = new BasicBlock("", CurFun.CurrentFunction);
- if (ID.Type == ValID::NameVal) {
- BB->setName(ID.Name);
+ ID.destroy(); // Free strdup'd memory
+ return BB;
+}
+
+/// getBBVal - get an existing BB value or create a forward reference for it.
+///
+static BasicBlock *getBBVal(const ValID &ID) {
+ assert(inFunctionScope() && "Can't get basic block at global scope!");
+
+ BasicBlock *BB = 0;
+
+ std::map<ValID, BasicBlock*>::iterator BBI = CurFun.BBForwardRefs.find(ID);
+ if (BBI != CurFun.BBForwardRefs.end()) {
+ BB = BBI->second;
+ } if (ID.Type == ValID::LocalName) {
+ std::string Name = ID.getName();
+ Value *N = CurFun.CurrentFunction->getValueSymbolTable().lookup(Name);
+ if (N)
+ if (N->getType()->getTypeID() == Type::LabelTyID)
+ BB = cast<BasicBlock>(N);
+ else
+ GenerateError("Reference to label '" + Name + "' is actually of type '"+
+ N->getType()->getDescription() + "'");
+ } else if (ID.Type == ValID::LocalID) {
+ if (ID.Num < CurFun.NextValNum && ID.Num < CurFun.Values.size()) {
+ if (CurFun.Values[ID.Num]->getType()->getTypeID() == Type::LabelTyID)
+ BB = cast<BasicBlock>(CurFun.Values[ID.Num]);
+ else
+ GenerateError("Reference to label '%" + utostr(ID.Num) +
+ "' is actually of type '"+
+ CurFun.Values[ID.Num]->getType()->getDescription() + "'");
+ }
} else {
- CurFun.NumberedBlocks[ID.Num] = BB;
+ GenerateError("Illegal label reference " + ID.getName());
+ return 0;
}
- // If this is not a definition, keep track of it so we can use it as a forward
- // reference.
- if (!isDefinition) {
- // Remember where this forward reference came from.
- CurFun.BBForwardRefs[BB] = std::make_pair(ID, llvmAsmlineno);
- } else {
- // The forward declaration could have been inserted anywhere in the
- // function: insert it into the correct place now.
- CurFun.CurrentFunction->getBasicBlockList().remove(BB);
- CurFun.CurrentFunction->getBasicBlockList().push_back(BB);
+ // If its already been defined, return it now.
+ if (BB) {
+ ID.destroy(); // Free strdup'd memory.
+ return BB;
}
- ID.destroy();
+
+ // Otherwise, this block has not been seen before, create it.
+ std::string Name;
+ if (ID.Type == ValID::LocalName)
+ Name = ID.getName();
+ BB = new BasicBlock(Name, CurFun.CurrentFunction);
+
+ // Insert it in the forward refs map.
+ CurFun.BBForwardRefs[ID] = BB;
+
return BB;
}
// defs now...
//
static void
-ResolveDefinitions(std::map<const Type*,ValueList> &LateResolvers,
- std::map<const Type*,ValueList> *FutureLateResolvers) {
+ResolveDefinitions(ValueList &LateResolvers, ValueList *FutureLateResolvers) {
// Loop over LateResolveDefs fixing up stuff that couldn't be resolved
- for (std::map<const Type*,ValueList>::iterator LRI = LateResolvers.begin(),
- E = LateResolvers.end(); LRI != E; ++LRI) {
- ValueList &List = LRI->second;
- while (!List.empty()) {
- Value *V = List.back();
- List.pop_back();
+ while (!LateResolvers.empty()) {
+ Value *V = LateResolvers.back();
+ LateResolvers.pop_back();
- std::map<Value*, std::pair<ValID, int> >::iterator PHI =
- CurModule.PlaceHolderInfo.find(V);
- assert(PHI != CurModule.PlaceHolderInfo.end() && "Placeholder error!");
+ std::map<Value*, std::pair<ValID, int> >::iterator PHI =
+ CurModule.PlaceHolderInfo.find(V);
+ assert(PHI != CurModule.PlaceHolderInfo.end() && "Placeholder error!");
- ValID &DID = PHI->second.first;
+ ValID &DID = PHI->second.first;
- Value *TheRealValue = getValNonImprovising(LRI->first, DID);
- if (TriggerError)
+ Value *TheRealValue = getExistingVal(V->getType(), DID);
+ if (TriggerError)
+ return;
+ if (TheRealValue) {
+ V->replaceAllUsesWith(TheRealValue);
+ delete V;
+ CurModule.PlaceHolderInfo.erase(PHI);
+ } else if (FutureLateResolvers) {
+ // Functions have their unresolved items forwarded to the module late
+ // resolver table
+ InsertValue(V, *FutureLateResolvers);
+ } else {
+ if (DID.Type == ValID::LocalName || DID.Type == ValID::GlobalName) {
+ GenerateError("Reference to an invalid definition: '" +DID.getName()+
+ "' of type '" + V->getType()->getDescription() + "'",
+ PHI->second.second);
return;
- if (TheRealValue) {
- V->replaceAllUsesWith(TheRealValue);
- delete V;
- CurModule.PlaceHolderInfo.erase(PHI);
- } else if (FutureLateResolvers) {
- // Functions have their unresolved items forwarded to the module late
- // resolver table
- InsertValue(V, *FutureLateResolvers);
} else {
- if (DID.Type == ValID::NameVal) {
- GenerateError("Reference to an invalid definition: '" +DID.getName()+
- "' of type '" + V->getType()->getDescription() + "'",
- PHI->second.second);
- return;
- } else {
- GenerateError("Reference to an invalid definition: #" +
- itostr(DID.Num) + " of type '" +
- V->getType()->getDescription() + "'",
- PHI->second.second);
- return;
- }
+ GenerateError("Reference to an invalid definition: #" +
+ itostr(DID.Num) + " of type '" +
+ V->getType()->getDescription() + "'",
+ PHI->second.second);
+ return;
}
}
}
-
LateResolvers.clear();
}
// name is not null) things referencing Name can be resolved. Otherwise, things
// refering to the number can be resolved. Do this now.
//
-static void ResolveTypeTo(char *Name, const Type *ToTy) {
+static void ResolveTypeTo(std::string *Name, const Type *ToTy) {
ValID D;
- if (Name) D = ValID::create(Name);
- else D = ValID::create((int)CurModule.Types.size());
+ if (Name)
+ D = ValID::createLocalName(*Name);
+ else
+ D = ValID::createLocalID(CurModule.Types.size());
std::map<ValID, PATypeHolder>::iterator I =
CurModule.LateResolveTypes.find(D);
// null potentially, in which case this is a noop. The string passed in is
// assumed to be a malloc'd string buffer, and is free'd by this function.
//
-static void setValueName(Value *V, char *NameStr) {
- if (NameStr) {
- std::string Name(NameStr); // Copy string
- free(NameStr); // Free old string
+static void setValueName(Value *V, std::string *NameStr) {
+ if (!NameStr) return;
+ std::string Name(*NameStr); // Copy string
+ delete NameStr; // Free old string
- if (V->getType() == Type::VoidTy) {
- GenerateError("Can't assign name '" + Name+"' to value with void type!");
- return;
- }
-
- assert(inFunctionScope() && "Must be in function scope!");
- SymbolTable &ST = CurFun.CurrentFunction->getValueSymbolTable();
- if (ST.lookup(V->getType(), Name)) {
- GenerateError("Redefinition of value '" + Name + "' of type '" +
- V->getType()->getDescription() + "'!");
- return;
- }
+ if (V->getType() == Type::VoidTy) {
+ GenerateError("Can't assign name '" + Name+"' to value with void type");
+ return;
+ }
- // Set the name.
- V->setName(Name);
+ assert(inFunctionScope() && "Must be in function scope!");
+ ValueSymbolTable &ST = CurFun.CurrentFunction->getValueSymbolTable();
+ if (ST.lookup(Name)) {
+ GenerateError("Redefinition of value '" + Name + "' of type '" +
+ V->getType()->getDescription() + "'");
+ return;
}
+
+ // Set the name.
+ V->setName(Name);
}
/// ParseGlobalVariable - Handle parsing of a global. If Initializer is null,
/// this is a declaration, otherwise it is a definition.
static GlobalVariable *
-ParseGlobalVariable(char *NameStr,GlobalValue::LinkageTypes Linkage,
+ParseGlobalVariable(std::string *NameStr,
+ GlobalValue::LinkageTypes Linkage,
+ GlobalValue::VisibilityTypes Visibility,
bool isConstantGlobal, const Type *Ty,
- Constant *Initializer) {
+ Constant *Initializer, bool IsThreadLocal,
+ unsigned AddressSpace = 0) {
if (isa<FunctionType>(Ty)) {
- GenerateError("Cannot declare global vars of function type!");
+ GenerateError("Cannot declare global vars of function type");
return 0;
}
- const PointerType *PTy = PointerType::get(Ty);
+ const PointerType *PTy = PointerType::get(Ty, AddressSpace);
std::string Name;
if (NameStr) {
- Name = NameStr; // Copy string
- free(NameStr); // Free old string
+ Name = *NameStr; // Copy string
+ delete NameStr; // Free old string
}
// See if this global value was forward referenced. If so, recycle the
// object.
ValID ID;
if (!Name.empty()) {
- ID = ValID::create((char*)Name.c_str());
+ ID = ValID::createGlobalName(Name);
} else {
- ID = ValID::create((int)CurModule.Values[PTy].size());
+ ID = ValID::createGlobalID(CurModule.Values.size());
}
if (GlobalValue *FWGV = CurModule.GetForwardRefForGlobal(PTy, ID)) {
CurModule.CurrentModule->getGlobalList().push_back(GV);
GV->setInitializer(Initializer);
GV->setLinkage(Linkage);
+ GV->setVisibility(Visibility);
GV->setConstant(isConstantGlobal);
+ GV->setThreadLocal(IsThreadLocal);
InsertValue(GV, CurModule.Values);
return GV;
}
- // If this global has a name, check to see if there is already a definition
- // of this global in the module. If so, it is an error.
+ // If this global has a name
if (!Name.empty()) {
- // We are a simple redefinition of a value, check to see if it is defined
- // the same as the old one.
- if (CurModule.CurrentModule->getGlobalVariable(Name, Ty)) {
- GenerateError("Redefinition of global variable named '" + Name +
- "' of type '" + Ty->getDescription() + "'!");
- return 0;
- }
+ // if the global we're parsing has an initializer (is a definition) and
+ // has external linkage.
+ if (Initializer && Linkage != GlobalValue::InternalLinkage)
+ // If there is already a global with external linkage with this name
+ if (CurModule.CurrentModule->getGlobalVariable(Name, false)) {
+ // If we allow this GVar to get created, it will be renamed in the
+ // symbol table because it conflicts with an existing GVar. We can't
+ // allow redefinition of GVars whose linking indicates that their name
+ // must stay the same. Issue the error.
+ GenerateError("Redefinition of global variable named '" + Name +
+ "' of type '" + Ty->getDescription() + "'");
+ return 0;
+ }
}
// Otherwise there is no existing GV to use, create one now.
GlobalVariable *GV =
new GlobalVariable(Ty, isConstantGlobal, Linkage, Initializer, Name,
- CurModule.CurrentModule);
+ CurModule.CurrentModule, IsThreadLocal, AddressSpace);
+ GV->setVisibility(Visibility);
InsertValue(GV, CurModule.Values);
return GV;
}
// This function returns true if the type has already been defined, but is
// allowed to be redefined in the specified context. If the name is a new name
// for the type plane, it is inserted and false is returned.
-static bool setTypeName(const Type *T, char *NameStr) {
+static bool setTypeName(const Type *T, std::string *NameStr) {
assert(!inFunctionScope() && "Can't give types function-local names!");
if (NameStr == 0) return false;
- std::string Name(NameStr); // Copy string
- free(NameStr); // Free old string
+ std::string Name(*NameStr); // Copy string
+ delete NameStr; // Free old string
// We don't allow assigning names to void type
if (T == Type::VoidTy) {
- GenerateError("Can't assign name '" + Name + "' to the void type!");
+ GenerateError("Can't assign name '" + Name + "' to the void type");
return false;
}
if (AlreadyExists) { // Inserting a name that is already defined???
const Type *Existing = CurModule.CurrentModule->getTypeByName(Name);
- assert(Existing && "Conflict but no matching type?");
+ assert(Existing && "Conflict but no matching type?!");
// There is only one case where this is allowed: when we are refining an
// opaque type. In this case, Existing will be an opaque type.
// Any other kind of (non-equivalent) redefinition is an error.
GenerateError("Redefinition of type named '" + Name + "' of type '" +
- T->getDescription() + "'!");
+ T->getDescription() + "'");
}
return false;
//
static Module* RunParser(Module * M);
-Module *llvm::RunVMAsmParser(const std::string &Filename, FILE *F) {
- set_scan_file(F);
-
- CurFilename = Filename;
- return RunParser(new Module(CurFilename));
-}
-
-Module *llvm::RunVMAsmParser(const char * AsmString, Module * M) {
- set_scan_string(AsmString);
-
- CurFilename = "from_memory";
- if (M == NULL) {
- return RunParser(new Module (CurFilename));
- } else {
- return RunParser(M);
- }
+Module *llvm::RunVMAsmParser(llvm::MemoryBuffer *MB) {
+ InitLLLexer(MB);
+ Module *M = RunParser(new Module(LLLgetFilename()));
+ FreeLexer();
+ return M;
}
%}
llvm::ArgListType *ArgList;
llvm::TypeWithAttrs TypeWithAttrs;
llvm::TypeWithAttrsList *TypeWithAttrsList;
- llvm::ValueRefList *ValueRefList;
+ llvm::ParamList *ParamList;
// Represent the RHS of PHI node
std::list<std::pair<llvm::Value*,
std::vector<llvm::Constant*> *ConstVector;
llvm::GlobalValue::LinkageTypes Linkage;
- llvm::FunctionType::ParameterAttributes ParamAttrs;
+ llvm::GlobalValue::VisibilityTypes Visibility;
+ uint16_t ParamAttrs;
+ llvm::APInt *APIntVal;
int64_t SInt64Val;
uint64_t UInt64Val;
int SIntVal;
unsigned UIntVal;
- double FPVal;
+ llvm::APFloat *FPVal;
bool BoolVal;
- char *StrVal; // This memory is strdup'd!
- llvm::ValID ValIDVal; // strdup'd memory maybe!
+ std::string *StrVal; // This memory must be deleted
+ llvm::ValID ValIDVal;
llvm::Instruction::BinaryOps BinaryOpVal;
llvm::Instruction::TermOps TermOpVal;
llvm::Instruction::MemoryOps MemOpVal;
llvm::Instruction::CastOps CastOpVal;
llvm::Instruction::OtherOps OtherOpVal;
- llvm::Module::Endianness Endianness;
llvm::ICmpInst::Predicate IPredicate;
llvm::FCmpInst::Predicate FPredicate;
}
%type <BasicBlockVal> BasicBlock InstructionList
%type <TermInstVal> BBTerminatorInst
%type <InstVal> Inst InstVal MemoryInst
-%type <ConstVal> ConstVal ConstExpr
+%type <ConstVal> ConstVal ConstExpr AliaseeRef
%type <ConstVector> ConstVector
%type <ArgList> ArgList ArgListH
%type <PHIList> PHIList
-%type <ValueRefList> ValueRefList // For call param lists & GEP indices
+%type <ParamList> ParamList // For call param lists & GEP indices
%type <ValueList> IndexList // For GEP indices
%type <TypeList> TypeListI
%type <TypeWithAttrsList> ArgTypeList ArgTypeListI
%type <TypeWithAttrs> ArgType
%type <JumpTable> JumpTable
%type <BoolVal> GlobalType // GLOBAL or CONSTANT?
+%type <BoolVal> ThreadLocal // 'thread_local' or not
%type <BoolVal> OptVolatile // 'volatile' or not
%type <BoolVal> OptTailCall // TAIL CALL or plain CALL.
%type <BoolVal> OptSideEffect // 'sideeffect' or not.
%type <Linkage> GVInternalLinkage GVExternalLinkage
%type <Linkage> FunctionDefineLinkage FunctionDeclareLinkage
-%type <Endianness> BigOrLittle
+%type <Linkage> AliasLinkage
+%type <Visibility> GVVisibilityStyle
// ValueRef - Unresolved reference to a definition or BB
%type <ValIDVal> ValueRef ConstValueRef SymbolicValueRef
// EUINT64VAL - A positive number within uns. long long range
%token <UInt64Val> EUINT64VAL
-%token <SIntVal> SINTVAL // Signed 32 bit ints...
-%token <UIntVal> UINTVAL // Unsigned 32 bit ints...
-%type <SIntVal> INTVAL
+// ESAPINTVAL - A negative number with arbitrary precision
+%token <APIntVal> ESAPINTVAL
+
+// EUAPINTVAL - A positive number with arbitrary precision
+%token <APIntVal> EUAPINTVAL
+
+%token <UIntVal> LOCALVAL_ID GLOBALVAL_ID // %123 @123
%token <FPVal> FPVAL // Float or Double constant
// Built in types...
%type <TypeVal> Types ResultTypes
%type <PrimType> IntType FPType PrimType // Classifications
-%token <PrimType> VOID BOOL INT8 INT16 INT32 INT64
-%token <PrimType> FLOAT DOUBLE LABEL
+%token <PrimType> VOID INTTYPE
+%token <PrimType> FLOAT DOUBLE X86_FP80 FP128 PPC_FP128 LABEL
%token TYPE
-%token <StrVal> VAR_ID LABELSTR STRINGCONSTANT
-%type <StrVal> Name OptName OptAssign
-%type <UIntVal> OptAlign OptCAlign
-%type <StrVal> OptSection SectionString
-%token IMPLEMENTATION ZEROINITIALIZER TRUETOK FALSETOK BEGINTOK ENDTOK
-%token DECLARE DEFINE GLOBAL CONSTANT SECTION VOLATILE
+%token<StrVal> LOCALVAR GLOBALVAR LABELSTR
+%token<StrVal> STRINGCONSTANT ATSTRINGCONSTANT PCTSTRINGCONSTANT
+%type <StrVal> LocalName OptLocalName OptLocalAssign
+%type <StrVal> GlobalName OptGlobalAssign GlobalAssign
+%type <StrVal> OptSection SectionString OptGC
+
+%type <UIntVal> OptAlign OptCAlign OptAddrSpace
+
+%token ZEROINITIALIZER TRUETOK FALSETOK BEGINTOK ENDTOK
+%token DECLARE DEFINE GLOBAL CONSTANT SECTION ALIAS VOLATILE THREAD_LOCAL
%token TO DOTDOTDOT NULL_TOK UNDEF INTERNAL LINKONCE WEAK APPENDING
%token DLLIMPORT DLLEXPORT EXTERN_WEAK
-%token OPAQUE NOT EXTERNAL TARGET TRIPLE ENDIAN POINTERSIZE LITTLE BIG ALIGN
+%token OPAQUE EXTERNAL TARGET TRIPLE ALIGN ADDRSPACE
%token DEPLIBS CALL TAIL ASM_TOK MODULE SIDEEFFECT
-%token CC_TOK CCC_TOK CSRETCC_TOK FASTCC_TOK COLDCC_TOK
-%token X86_STDCALLCC_TOK X86_FASTCALLCC_TOK
+%token CC_TOK CCC_TOK FASTCC_TOK COLDCC_TOK X86_STDCALLCC_TOK X86_FASTCALLCC_TOK
%token DATALAYOUT
%type <UIntVal> OptCallingConv
%type <ParamAttrs> OptParamAttrs ParamAttr
// Binary Operators
%type <BinaryOpVal> ArithmeticOps LogicalOps // Binops Subcatagories
%token <BinaryOpVal> ADD SUB MUL UDIV SDIV FDIV UREM SREM FREM AND OR XOR
+%token <BinaryOpVal> SHL LSHR ASHR
+
%token <OtherOpVal> ICMP FCMP
%type <IPredicate> IPredicates
%type <FPredicate> FPredicates
%token <CastOpVal> UITOFP SITOFP FPTOUI FPTOSI INTTOPTR PTRTOINT
// Other Operators
-%type <OtherOpVal> ShiftOps
-%token <OtherOpVal> PHI_TOK SELECT SHL LSHR ASHR VAARG
+%token <OtherOpVal> PHI_TOK SELECT VAARG
%token <OtherOpVal> EXTRACTELEMENT INSERTELEMENT SHUFFLEVECTOR
// Function Attributes
-%token NORETURN
+%token SIGNEXT ZEROEXT NORETURN INREG SRET NOUNWIND NOALIAS BYVAL NEST
+%token READNONE READONLY GC
+
+// Visibility Styles
+%token DEFAULT HIDDEN PROTECTED
%start Module
%%
-// Handle constant integer size restriction and conversion...
-//
-INTVAL : SINTVAL;
-INTVAL : UINTVAL {
- if ($1 > (uint32_t)INT32_MAX) // Outside of my range!
- GEN_ERROR("Value too large for type!");
- $$ = (int32_t)$1;
- CHECK_FOR_ERROR
-};
// Operations that are notably excluded from this list include:
// RET, BR, & SWITCH because they end basic blocks and are treated specially.
//
ArithmeticOps: ADD | SUB | MUL | UDIV | SDIV | FDIV | UREM | SREM | FREM;
-LogicalOps : AND | OR | XOR;
+LogicalOps : SHL | LSHR | ASHR | AND | OR | XOR;
CastOps : TRUNC | ZEXT | SEXT | FPTRUNC | FPEXT | BITCAST |
UITOFP | SITOFP | FPTOUI | FPTOSI | INTTOPTR | PTRTOINT;
-ShiftOps : SHL | LSHR | ASHR;
+
IPredicates
: EQ { $$ = ICmpInst::ICMP_EQ; } | NE { $$ = ICmpInst::ICMP_NE; }
| SLT { $$ = ICmpInst::ICMP_SLT; } | SGT { $$ = ICmpInst::ICMP_SGT; }
// These are some types that allow classification if we only want a particular
// thing... for example, only a signed, unsigned, or integral type.
-IntType : INT64 | INT32 | INT16 | INT8;
-FPType : FLOAT | DOUBLE;
+IntType : INTTYPE;
+FPType : FLOAT | DOUBLE | PPC_FP128 | FP128 | X86_FP80;
-// OptAssign - Value producing statements have an optional assignment component
-OptAssign : Name '=' {
+LocalName : LOCALVAR | STRINGCONSTANT | PCTSTRINGCONSTANT ;
+OptLocalName : LocalName | /*empty*/ { $$ = 0; };
+
+OptAddrSpace : ADDRSPACE '(' EUINT64VAL ')' { $$=$3; }
+ | /*empty*/ { $$=0; };
+
+/// OptLocalAssign - Value producing statements have an optional assignment
+/// component.
+OptLocalAssign : LocalName '=' {
$$ = $1;
CHECK_FOR_ERROR
}
CHECK_FOR_ERROR
};
+GlobalName : GLOBALVAR | ATSTRINGCONSTANT ;
+
+OptGlobalAssign : GlobalAssign
+ | /*empty*/ {
+ $$ = 0;
+ CHECK_FOR_ERROR
+ };
+
+GlobalAssign : GlobalName '=' {
+ $$ = $1;
+ CHECK_FOR_ERROR
+ };
+
GVInternalLinkage
: INTERNAL { $$ = GlobalValue::InternalLinkage; }
| WEAK { $$ = GlobalValue::WeakLinkage; }
| EXTERNAL { $$ = GlobalValue::ExternalLinkage; }
;
+GVVisibilityStyle
+ : /*empty*/ { $$ = GlobalValue::DefaultVisibility; }
+ | DEFAULT { $$ = GlobalValue::DefaultVisibility; }
+ | HIDDEN { $$ = GlobalValue::HiddenVisibility; }
+ | PROTECTED { $$ = GlobalValue::ProtectedVisibility; }
+ ;
+
FunctionDeclareLinkage
: /*empty*/ { $$ = GlobalValue::ExternalLinkage; }
| DLLIMPORT { $$ = GlobalValue::DLLImportLinkage; }
| EXTERN_WEAK { $$ = GlobalValue::ExternalWeakLinkage; }
;
-FunctionDefineLinkage
+FunctionDefineLinkage
: /*empty*/ { $$ = GlobalValue::ExternalLinkage; }
| INTERNAL { $$ = GlobalValue::InternalLinkage; }
| LINKONCE { $$ = GlobalValue::LinkOnceLinkage; }
| DLLEXPORT { $$ = GlobalValue::DLLExportLinkage; }
;
+AliasLinkage
+ : /*empty*/ { $$ = GlobalValue::ExternalLinkage; }
+ | WEAK { $$ = GlobalValue::WeakLinkage; }
+ | INTERNAL { $$ = GlobalValue::InternalLinkage; }
+ ;
+
OptCallingConv : /*empty*/ { $$ = CallingConv::C; } |
CCC_TOK { $$ = CallingConv::C; } |
- CSRETCC_TOK { $$ = CallingConv::CSRet; } |
FASTCC_TOK { $$ = CallingConv::Fast; } |
COLDCC_TOK { $$ = CallingConv::Cold; } |
X86_STDCALLCC_TOK { $$ = CallingConv::X86_StdCall; } |
X86_FASTCALLCC_TOK { $$ = CallingConv::X86_FastCall; } |
CC_TOK EUINT64VAL {
if ((unsigned)$2 != $2)
- GEN_ERROR("Calling conv too large!");
+ GEN_ERROR("Calling conv too large");
$$ = $2;
CHECK_FOR_ERROR
};
-ParamAttr : ZEXT { $$ = FunctionType::ZExtAttribute; }
- | SEXT { $$ = FunctionType::SExtAttribute; }
+ParamAttr : ZEROEXT { $$ = ParamAttr::ZExt; }
+ | ZEXT { $$ = ParamAttr::ZExt; }
+ | SIGNEXT { $$ = ParamAttr::SExt; }
+ | SEXT { $$ = ParamAttr::SExt; }
+ | INREG { $$ = ParamAttr::InReg; }
+ | SRET { $$ = ParamAttr::StructRet; }
+ | NOALIAS { $$ = ParamAttr::NoAlias; }
+ | BYVAL { $$ = ParamAttr::ByVal; }
+ | NEST { $$ = ParamAttr::Nest; }
;
-OptParamAttrs : /* empty */ { $$ = FunctionType::NoAttributeSet; }
+OptParamAttrs : /* empty */ { $$ = ParamAttr::None; }
| OptParamAttrs ParamAttr {
- $$ = FunctionType::ParameterAttributes($1 | $2);
+ $$ = $1 | $2;
}
;
-FuncAttr : NORETURN { $$ = FunctionType::NoReturnAttribute; }
- | ParamAttr
+FuncAttr : NORETURN { $$ = ParamAttr::NoReturn; }
+ | NOUNWIND { $$ = ParamAttr::NoUnwind; }
+ | ZEROEXT { $$ = ParamAttr::ZExt; }
+ | SIGNEXT { $$ = ParamAttr::SExt; }
+ | READNONE { $$ = ParamAttr::ReadNone; }
+ | READONLY { $$ = ParamAttr::ReadOnly; }
;
-OptFuncAttrs : /* empty */ { $$ = FunctionType::NoAttributeSet; }
+OptFuncAttrs : /* empty */ { $$ = ParamAttr::None; }
| OptFuncAttrs FuncAttr {
- $$ = FunctionType::ParameterAttributes($1 | $2);
+ $$ = $1 | $2;
+ }
+ ;
+
+OptGC : /* empty */ { $$ = 0; }
+ | GC STRINGCONSTANT {
+ $$ = $2;
}
;
ALIGN EUINT64VAL {
$$ = $2;
if ($$ != 0 && !isPowerOf2_32($$))
- GEN_ERROR("Alignment must be a power of two!");
+ GEN_ERROR("Alignment must be a power of two");
CHECK_FOR_ERROR
};
OptCAlign : /*empty*/ { $$ = 0; } |
',' ALIGN EUINT64VAL {
$$ = $3;
if ($$ != 0 && !isPowerOf2_32($$))
- GEN_ERROR("Alignment must be a power of two!");
+ GEN_ERROR("Alignment must be a power of two");
CHECK_FOR_ERROR
};
+
SectionString : SECTION STRINGCONSTANT {
- for (unsigned i = 0, e = strlen($2); i != e; ++i)
- if ($2[i] == '"' || $2[i] == '\\')
- GEN_ERROR("Invalid character in section name!");
+ for (unsigned i = 0, e = $2->length(); i != e; ++i)
+ if ((*$2)[i] == '"' || (*$2)[i] == '\\')
+ GEN_ERROR("Invalid character in section name");
$$ = $2;
CHECK_FOR_ERROR
};
GlobalVarAttributes : /* empty */ {} |
',' GlobalVarAttribute GlobalVarAttributes {};
GlobalVarAttribute : SectionString {
- CurGV->setSection($1);
- free($1);
+ CurGV->setSection(*$1);
+ delete $1;
CHECK_FOR_ERROR
}
| ALIGN EUINT64VAL {
if ($2 != 0 && !isPowerOf2_32($2))
- GEN_ERROR("Alignment must be a power of two!");
+ GEN_ERROR("Alignment must be a power of two");
CurGV->setAlignment($2);
CHECK_FOR_ERROR
};
// Derived types are added later...
//
-PrimType : BOOL | INT8 | INT16 | INT32 | INT64 | FLOAT | DOUBLE | LABEL ;
+PrimType : INTTYPE | FLOAT | DOUBLE | PPC_FP128 | FP128 | X86_FP80 | LABEL ;
Types
: OPAQUE {
$$ = new PATypeHolder($1);
CHECK_FOR_ERROR
}
- | Types '*' { // Pointer type?
+ | Types OptAddrSpace '*' { // Pointer type?
if (*$1 == Type::LabelTy)
GEN_ERROR("Cannot form a pointer to a basic block");
- $$ = new PATypeHolder(HandleUpRefs(PointerType::get(*$1)));
+ $$ = new PATypeHolder(HandleUpRefs(PointerType::get(*$1, $2)));
delete $1;
CHECK_FOR_ERROR
}
$$ = new PATypeHolder(tmp);
}
| '\\' EUINT64VAL { // Type UpReference
- if ($2 > (uint64_t)~0U) GEN_ERROR("Value out of range!");
+ if ($2 > (uint64_t)~0U) GEN_ERROR("Value out of range");
OpaqueType *OT = OpaqueType::get(); // Use temporary placeholder
UpRefs.push_back(UpRefRecord((unsigned)$2, OT)); // Add to vector...
$$ = new PATypeHolder(OT);
CHECK_FOR_ERROR
}
| Types '(' ArgTypeListI ')' OptFuncAttrs {
+ // Allow but ignore attributes on function types; this permits auto-upgrade.
+ // FIXME: remove in LLVM 3.0.
+ const Type* RetTy = *$1;
+ if (!(RetTy->isFirstClassType() || RetTy == Type::VoidTy ||
+ isa<OpaqueType>(RetTy)))
+ GEN_ERROR("LLVM Functions cannot return aggregates");
+
std::vector<const Type*> Params;
- std::vector<FunctionType::ParameterAttributes> Attrs;
- Attrs.push_back($5);
- for (TypeWithAttrsList::iterator I=$3->begin(), E=$3->end(); I != E; ++I) {
- Params.push_back(I->Ty->get());
- if (I->Ty->get() != Type::VoidTy)
- Attrs.push_back(I->Attrs);
+ TypeWithAttrsList::iterator I = $3->begin(), E = $3->end();
+ for (; I != E; ++I ) {
+ const Type *Ty = I->Ty->get();
+ Params.push_back(Ty);
}
+
bool isVarArg = Params.size() && Params.back() == Type::VoidTy;
if (isVarArg) Params.pop_back();
- FunctionType *FT = FunctionType::get(*$1, Params, isVarArg, Attrs);
- delete $3; // Delete the argument list
+ for (unsigned i = 0; i != Params.size(); ++i)
+ if (!(Params[i]->isFirstClassType() || isa<OpaqueType>(Params[i])))
+ GEN_ERROR("Function arguments must be value types!");
+
+ CHECK_FOR_ERROR
+
+ FunctionType *FT = FunctionType::get(RetTy, Params, isVarArg);
+ delete $3; // Delete the argument list
delete $1; // Delete the return type handle
$$ = new PATypeHolder(HandleUpRefs(FT));
CHECK_FOR_ERROR
}
| VOID '(' ArgTypeListI ')' OptFuncAttrs {
+ // Allow but ignore attributes on function types; this permits auto-upgrade.
+ // FIXME: remove in LLVM 3.0.
std::vector<const Type*> Params;
- std::vector<FunctionType::ParameterAttributes> Attrs;
- Attrs.push_back($5);
- for (TypeWithAttrsList::iterator I=$3->begin(), E=$3->end(); I != E; ++I) {
- Params.push_back(I->Ty->get());
- if (I->Ty->get() != Type::VoidTy)
- Attrs.push_back(I->Attrs);
+ TypeWithAttrsList::iterator I = $3->begin(), E = $3->end();
+ for ( ; I != E; ++I ) {
+ const Type* Ty = I->Ty->get();
+ Params.push_back(Ty);
}
+
bool isVarArg = Params.size() && Params.back() == Type::VoidTy;
if (isVarArg) Params.pop_back();
- FunctionType *FT = FunctionType::get($1, Params, isVarArg, Attrs);
+ for (unsigned i = 0; i != Params.size(); ++i)
+ if (!(Params[i]->isFirstClassType() || isa<OpaqueType>(Params[i])))
+ GEN_ERROR("Function arguments must be value types!");
+
+ CHECK_FOR_ERROR
+
+ FunctionType *FT = FunctionType::get($1, Params, isVarArg);
delete $3; // Delete the argument list
$$ = new PATypeHolder(HandleUpRefs(FT));
CHECK_FOR_ERROR
delete $4;
CHECK_FOR_ERROR
}
- | '<' EUINT64VAL 'x' Types '>' { // Packed array type?
+ | '<' EUINT64VAL 'x' Types '>' { // Vector type?
const llvm::Type* ElemTy = $4->get();
if ((unsigned)$2 != $2)
GEN_ERROR("Unsigned result not equal to signed result");
- if (!ElemTy->isPrimitiveType())
- GEN_ERROR("Elemental type of a PackedType must be primitive");
- if (!isPowerOf2_32($2))
- GEN_ERROR("Vector length should be a power of 2!");
- $$ = new PATypeHolder(HandleUpRefs(PackedType::get(*$4, (unsigned)$2)));
+ if (!ElemTy->isFloatingPoint() && !ElemTy->isInteger())
+ GEN_ERROR("Element type of a VectorType must be primitive");
+ $$ = new PATypeHolder(HandleUpRefs(VectorType::get(*$4, (unsigned)$2)));
delete $4;
CHECK_FOR_ERROR
}
;
ArgType
- : Types OptParamAttrs {
+ : Types OptParamAttrs {
+ // Allow but ignore attributes on function types; this permits auto-upgrade.
+ // FIXME: remove in LLVM 3.0.
$$.Ty = $1;
- $$.Attrs = $2;
+ $$.Attrs = ParamAttr::None;
}
;
if (!UpRefs.empty())
GEN_ERROR("Invalid upreference in type: " + (*$1)->getDescription());
if (!(*$1)->isFirstClassType())
- GEN_ERROR("LLVM functions cannot return aggregate types!");
+ GEN_ERROR("LLVM functions cannot return aggregate types");
$$ = $1;
}
| VOID {
: ArgTypeList
| ArgTypeList ',' DOTDOTDOT {
$$=$1;
- TypeWithAttrs TWA; TWA.Attrs = FunctionType::NoAttributeSet;
+ TypeWithAttrs TWA; TWA.Attrs = ParamAttr::None;
TWA.Ty = new PATypeHolder(Type::VoidTy);
$$->push_back(TWA);
CHECK_FOR_ERROR
}
| DOTDOTDOT {
$$ = new TypeWithAttrsList;
- TypeWithAttrs TWA; TWA.Attrs = FunctionType::NoAttributeSet;
+ TypeWithAttrs TWA; TWA.Attrs = ParamAttr::None;
TWA.Ty = new PATypeHolder(Type::VoidTy);
$$->push_back(TWA);
CHECK_FOR_ERROR
//
TypeListI : Types {
$$ = new std::list<PATypeHolder>();
- $$->push_back(*$1); delete $1;
+ $$->push_back(*$1);
+ delete $1;
CHECK_FOR_ERROR
}
| TypeListI ',' Types {
- ($$=$1)->push_back(*$3); delete $3;
+ ($$=$1)->push_back(*$3);
+ delete $3;
CHECK_FOR_ERROR
};
const ArrayType *ATy = dyn_cast<ArrayType>($1->get());
if (ATy == 0)
GEN_ERROR("Cannot make array constant with type: '" +
- (*$1)->getDescription() + "'!");
+ (*$1)->getDescription() + "'");
const Type *ETy = ATy->getElementType();
int NumElements = ATy->getNumElements();
if (NumElements != -1 && NumElements != (int)$3->size())
GEN_ERROR("Type mismatch: constant sized array initialized with " +
utostr($3->size()) + " arguments, but has size of " +
- itostr(NumElements) + "!");
+ itostr(NumElements) + "");
// Verify all elements are correct type!
for (unsigned i = 0; i < $3->size(); i++) {
const ArrayType *ATy = dyn_cast<ArrayType>($1->get());
if (ATy == 0)
GEN_ERROR("Cannot make array constant with type: '" +
- (*$1)->getDescription() + "'!");
+ (*$1)->getDescription() + "'");
int NumElements = ATy->getNumElements();
if (NumElements != -1 && NumElements != 0)
GEN_ERROR("Type mismatch: constant sized array initialized with 0"
- " arguments, but has size of " + itostr(NumElements) +"!");
+ " arguments, but has size of " + itostr(NumElements) +"");
$$ = ConstantArray::get(ATy, std::vector<Constant*>());
delete $1;
CHECK_FOR_ERROR
const ArrayType *ATy = dyn_cast<ArrayType>($1->get());
if (ATy == 0)
GEN_ERROR("Cannot make array constant with type: '" +
- (*$1)->getDescription() + "'!");
+ (*$1)->getDescription() + "'");
int NumElements = ATy->getNumElements();
const Type *ETy = ATy->getElementType();
- char *EndStr = UnEscapeLexed($3, true);
- if (NumElements != -1 && NumElements != (EndStr-$3))
+ if (NumElements != -1 && NumElements != int($3->length()))
GEN_ERROR("Can't build string constant of size " +
- itostr((int)(EndStr-$3)) +
- " when array has size " + itostr(NumElements) + "!");
+ itostr((int)($3->length())) +
+ " when array has size " + itostr(NumElements) + "");
std::vector<Constant*> Vals;
if (ETy == Type::Int8Ty) {
- for (unsigned char *C = (unsigned char *)$3;
- C != (unsigned char*)EndStr; ++C)
- Vals.push_back(ConstantInt::get(ETy, *C));
+ for (unsigned i = 0; i < $3->length(); ++i)
+ Vals.push_back(ConstantInt::get(ETy, (*$3)[i]));
} else {
- free($3);
- GEN_ERROR("Cannot build string arrays of non byte sized elements!");
+ delete $3;
+ GEN_ERROR("Cannot build string arrays of non byte sized elements");
}
- free($3);
+ delete $3;
$$ = ConstantArray::get(ATy, Vals);
delete $1;
CHECK_FOR_ERROR
| Types '<' ConstVector '>' { // Nonempty unsized arr
if (!UpRefs.empty())
GEN_ERROR("Invalid upreference in type: " + (*$1)->getDescription());
- const PackedType *PTy = dyn_cast<PackedType>($1->get());
+ const VectorType *PTy = dyn_cast<VectorType>($1->get());
if (PTy == 0)
GEN_ERROR("Cannot make packed constant with type: '" +
- (*$1)->getDescription() + "'!");
+ (*$1)->getDescription() + "'");
const Type *ETy = PTy->getElementType();
int NumElements = PTy->getNumElements();
if (NumElements != -1 && NumElements != (int)$3->size())
GEN_ERROR("Type mismatch: constant sized packed initialized with " +
utostr($3->size()) + " arguments, but has size of " +
- itostr(NumElements) + "!");
+ itostr(NumElements) + "");
// Verify all elements are correct type!
for (unsigned i = 0; i < $3->size(); i++) {
(*$3)[i]->getType()->getDescription() + "'.");
}
- $$ = ConstantPacked::get(PTy, *$3);
+ $$ = ConstantVector::get(PTy, *$3);
delete $1; delete $3;
CHECK_FOR_ERROR
}
const StructType *STy = dyn_cast<StructType>($1->get());
if (STy == 0)
GEN_ERROR("Cannot make struct constant with type: '" +
- (*$1)->getDescription() + "'!");
+ (*$1)->getDescription() + "'");
if ($3->size() != STy->getNumContainedTypes())
- GEN_ERROR("Illegal number of initializers for structure type!");
+ GEN_ERROR("Illegal number of initializers for structure type");
// Check to ensure that constants are compatible with the type initializer!
for (unsigned i = 0, e = $3->size(); i != e; ++i)
GEN_ERROR("Expected type '" +
STy->getElementType(i)->getDescription() +
"' for element #" + utostr(i) +
- " of structure initializer!");
+ " of structure initializer");
+
+ // Check to ensure that Type is not packed
+ if (STy->isPacked())
+ GEN_ERROR("Unpacked Initializer to vector type '" +
+ STy->getDescription() + "'");
$$ = ConstantStruct::get(STy, *$3);
delete $1; delete $3;
const StructType *STy = dyn_cast<StructType>($1->get());
if (STy == 0)
GEN_ERROR("Cannot make struct constant with type: '" +
- (*$1)->getDescription() + "'!");
+ (*$1)->getDescription() + "'");
+
+ if (STy->getNumContainedTypes() != 0)
+ GEN_ERROR("Illegal number of initializers for structure type");
+
+ // Check to ensure that Type is not packed
+ if (STy->isPacked())
+ GEN_ERROR("Unpacked Initializer to vector type '" +
+ STy->getDescription() + "'");
+
+ $$ = ConstantStruct::get(STy, std::vector<Constant*>());
+ delete $1;
+ CHECK_FOR_ERROR
+ }
+ | Types '<' '{' ConstVector '}' '>' {
+ const StructType *STy = dyn_cast<StructType>($1->get());
+ if (STy == 0)
+ GEN_ERROR("Cannot make struct constant with type: '" +
+ (*$1)->getDescription() + "'");
+
+ if ($4->size() != STy->getNumContainedTypes())
+ GEN_ERROR("Illegal number of initializers for structure type");
+
+ // Check to ensure that constants are compatible with the type initializer!
+ for (unsigned i = 0, e = $4->size(); i != e; ++i)
+ if ((*$4)[i]->getType() != STy->getElementType(i))
+ GEN_ERROR("Expected type '" +
+ STy->getElementType(i)->getDescription() +
+ "' for element #" + utostr(i) +
+ " of structure initializer");
+
+ // Check to ensure that Type is packed
+ if (!STy->isPacked())
+ GEN_ERROR("Vector initializer to non-vector type '" +
+ STy->getDescription() + "'");
+
+ $$ = ConstantStruct::get(STy, *$4);
+ delete $1; delete $4;
+ CHECK_FOR_ERROR
+ }
+ | Types '<' '{' '}' '>' {
+ if (!UpRefs.empty())
+ GEN_ERROR("Invalid upreference in type: " + (*$1)->getDescription());
+ const StructType *STy = dyn_cast<StructType>($1->get());
+ if (STy == 0)
+ GEN_ERROR("Cannot make struct constant with type: '" +
+ (*$1)->getDescription() + "'");
if (STy->getNumContainedTypes() != 0)
- GEN_ERROR("Illegal number of initializers for structure type!");
+ GEN_ERROR("Illegal number of initializers for structure type");
+
+ // Check to ensure that Type is packed
+ if (!STy->isPacked())
+ GEN_ERROR("Vector initializer to non-vector type '" +
+ STy->getDescription() + "'");
$$ = ConstantStruct::get(STy, std::vector<Constant*>());
delete $1;
const PointerType *PTy = dyn_cast<PointerType>($1->get());
if (PTy == 0)
GEN_ERROR("Cannot make null pointer constant with type: '" +
- (*$1)->getDescription() + "'!");
+ (*$1)->getDescription() + "'");
$$ = ConstantPointerNull::get(PTy);
delete $1;
GEN_ERROR("Invalid upreference in type: " + (*$1)->getDescription());
const PointerType *Ty = dyn_cast<PointerType>($1->get());
if (Ty == 0)
- GEN_ERROR("Global const reference must be a pointer type!");
+ GEN_ERROR("Global const reference must be a pointer type");
// ConstExprs can exist in the body of a function, thus creating
// GlobalValues whenever they refer to a variable. Because we are in
- // the context of a function, getValNonImprovising will search the functions
+ // the context of a function, getExistingVal will search the functions
// symbol table instead of the module symbol table for the global symbol,
// which throws things all off. To get around this, we just tell
- // getValNonImprovising that we are at global scope here.
+ // getExistingVal that we are at global scope here.
//
Function *SavedCurFn = CurFun.CurrentFunction;
CurFun.CurrentFunction = 0;
- Value *V = getValNonImprovising(Ty, $2);
+ Value *V = getExistingVal(Ty, $2);
CHECK_FOR_ERROR
CurFun.CurrentFunction = SavedCurFn;
$2.destroy();
} else {
std::string Name;
- if ($2.Type == ValID::NameVal) Name = $2.Name;
+ if ($2.Type == ValID::GlobalName)
+ Name = $2.getName();
+ else if ($2.Type != ValID::GlobalID)
+ GEN_ERROR("Invalid reference to global");
// Create the forward referenced global.
GlobalValue *GV;
if (const FunctionType *FTy =
dyn_cast<FunctionType>(PT->getElementType())) {
- GV = new Function(FTy, GlobalValue::ExternalLinkage, Name,
+ GV = new Function(FTy, GlobalValue::ExternalWeakLinkage, Name,
CurModule.CurrentModule);
} else {
GV = new GlobalVariable(PT->getElementType(), false,
- GlobalValue::ExternalLinkage, 0,
+ GlobalValue::ExternalWeakLinkage, 0,
Name, CurModule.CurrentModule);
}
GEN_ERROR("Invalid upreference in type: " + (*$1)->getDescription());
const Type *Ty = $1->get();
if (isa<FunctionType>(Ty) || Ty == Type::LabelTy || isa<OpaqueType>(Ty))
- GEN_ERROR("Cannot create a null initialized value of this type!");
+ GEN_ERROR("Cannot create a null initialized value of this type");
$$ = Constant::getNullValue(Ty);
delete $1;
CHECK_FOR_ERROR
}
| IntType ESINT64VAL { // integral constants
if (!ConstantInt::isValueValidForType($1, $2))
- GEN_ERROR("Constant value doesn't fit in type!");
- $$ = ConstantInt::get($1, $2);
+ GEN_ERROR("Constant value doesn't fit in type");
+ $$ = ConstantInt::get($1, $2, true);
+ CHECK_FOR_ERROR
+ }
+ | IntType ESAPINTVAL { // arbitrary precision integer constants
+ uint32_t BitWidth = cast<IntegerType>($1)->getBitWidth();
+ if ($2->getBitWidth() > BitWidth) {
+ GEN_ERROR("Constant value does not fit in type");
+ }
+ $2->sextOrTrunc(BitWidth);
+ $$ = ConstantInt::get(*$2);
+ delete $2;
CHECK_FOR_ERROR
}
| IntType EUINT64VAL { // integral constants
if (!ConstantInt::isValueValidForType($1, $2))
- GEN_ERROR("Constant value doesn't fit in type!");
- $$ = ConstantInt::get($1, $2);
+ GEN_ERROR("Constant value doesn't fit in type");
+ $$ = ConstantInt::get($1, $2, false);
CHECK_FOR_ERROR
}
- | BOOL TRUETOK { // Boolean constants
- $$ = ConstantBool::getTrue();
+ | IntType EUAPINTVAL { // arbitrary precision integer constants
+ uint32_t BitWidth = cast<IntegerType>($1)->getBitWidth();
+ if ($2->getBitWidth() > BitWidth) {
+ GEN_ERROR("Constant value does not fit in type");
+ }
+ $2->zextOrTrunc(BitWidth);
+ $$ = ConstantInt::get(*$2);
+ delete $2;
CHECK_FOR_ERROR
}
- | BOOL FALSETOK { // Boolean constants
- $$ = ConstantBool::getFalse();
+ | INTTYPE TRUETOK { // Boolean constants
+ assert(cast<IntegerType>($1)->getBitWidth() == 1 && "Not Bool?");
+ $$ = ConstantInt::getTrue();
CHECK_FOR_ERROR
}
- | FPType FPVAL { // Float & Double constants
- if (!ConstantFP::isValueValidForType($1, $2))
- GEN_ERROR("Floating point constant invalid for type!!");
- $$ = ConstantFP::get($1, $2);
+ | INTTYPE FALSETOK { // Boolean constants
+ assert(cast<IntegerType>($1)->getBitWidth() == 1 && "Not Bool?");
+ $$ = ConstantInt::getFalse();
+ CHECK_FOR_ERROR
+ }
+ | FPType FPVAL { // Floating point constants
+ if (!ConstantFP::isValueValidForType($1, *$2))
+ GEN_ERROR("Floating point constant invalid for type");
+ // Lexer has no type info, so builds all float and double FP constants
+ // as double. Fix this here. Long double is done right.
+ if (&$2->getSemantics()==&APFloat::IEEEdouble && $1==Type::FloatTy)
+ $2->convert(APFloat::IEEEsingle, APFloat::rmNearestTiesToEven);
+ $$ = ConstantFP::get($1, *$2);
+ delete $2;
CHECK_FOR_ERROR
};
if (!UpRefs.empty())
GEN_ERROR("Invalid upreference in type: " + (*$5)->getDescription());
Constant *Val = $3;
- const Type *Ty = $5->get();
- if (!Val->getType()->isFirstClassType())
- GEN_ERROR("cast constant expression from a non-primitive type: '" +
- Val->getType()->getDescription() + "'!");
- if (!Ty->isFirstClassType())
- GEN_ERROR("cast constant expression to a non-primitive type: '" +
- Ty->getDescription() + "'!");
- $$ = ConstantExpr::getCast($1, $3, $5->get());
+ const Type *DestTy = $5->get();
+ if (!CastInst::castIsValid($1, $3, DestTy))
+ GEN_ERROR("invalid cast opcode for cast from '" +
+ Val->getType()->getDescription() + "' to '" +
+ DestTy->getDescription() + "'");
+ $$ = ConstantExpr::getCast($1, $3, DestTy);
delete $5;
}
| GETELEMENTPTR '(' ConstVal IndexList ')' {
if (!isa<PointerType>($3->getType()))
- GEN_ERROR("GetElementPtr requires a pointer operand!");
+ GEN_ERROR("GetElementPtr requires a pointer operand");
const Type *IdxTy =
- GetElementPtrInst::getIndexedType($3->getType(), *$4, true);
+ GetElementPtrInst::getIndexedType($3->getType(), $4->begin(), $4->end(),
+ true);
if (!IdxTy)
- GEN_ERROR("Index list invalid for constant getelementptr!");
+ GEN_ERROR("Index list invalid for constant getelementptr");
- std::vector<Constant*> IdxVec;
+ SmallVector<Constant*, 8> IdxVec;
for (unsigned i = 0, e = $4->size(); i != e; ++i)
if (Constant *C = dyn_cast<Constant>((*$4)[i]))
IdxVec.push_back(C);
else
- GEN_ERROR("Indices to constant getelementptr must be constants!");
+ GEN_ERROR("Indices to constant getelementptr must be constants");
delete $4;
- $$ = ConstantExpr::getGetElementPtr($3, IdxVec);
+ $$ = ConstantExpr::getGetElementPtr($3, &IdxVec[0], IdxVec.size());
CHECK_FOR_ERROR
}
| SELECT '(' ConstVal ',' ConstVal ',' ConstVal ')' {
- if ($3->getType() != Type::BoolTy)
- GEN_ERROR("Select condition must be of boolean type!");
+ if ($3->getType() != Type::Int1Ty)
+ GEN_ERROR("Select condition must be of boolean type");
if ($5->getType() != $7->getType())
- GEN_ERROR("Select operand types must match!");
+ GEN_ERROR("Select operand types must match");
$$ = ConstantExpr::getSelect($3, $5, $7);
CHECK_FOR_ERROR
}
| ArithmeticOps '(' ConstVal ',' ConstVal ')' {
if ($3->getType() != $5->getType())
- GEN_ERROR("Binary operator types must match!");
+ GEN_ERROR("Binary operator types must match");
CHECK_FOR_ERROR;
$$ = ConstantExpr::get($1, $3, $5);
}
| LogicalOps '(' ConstVal ',' ConstVal ')' {
if ($3->getType() != $5->getType())
- GEN_ERROR("Logical operator types must match!");
- if (!$3->getType()->isIntegral()) {
- if (!isa<PackedType>($3->getType()) ||
- !cast<PackedType>($3->getType())->getElementType()->isIntegral())
- GEN_ERROR("Logical operator requires integral operands!");
+ GEN_ERROR("Logical operator types must match");
+ if (!$3->getType()->isInteger()) {
+ if (Instruction::isShift($1) || !isa<VectorType>($3->getType()) ||
+ !cast<VectorType>($3->getType())->getElementType()->isInteger())
+ GEN_ERROR("Logical operator requires integral operands");
}
$$ = ConstantExpr::get($1, $3, $5);
CHECK_FOR_ERROR
}
| ICMP IPredicates '(' ConstVal ',' ConstVal ')' {
if ($4->getType() != $6->getType())
- GEN_ERROR("icmp operand types must match!");
+ GEN_ERROR("icmp operand types must match");
$$ = ConstantExpr::getICmp($2, $4, $6);
}
| FCMP FPredicates '(' ConstVal ',' ConstVal ')' {
if ($4->getType() != $6->getType())
- GEN_ERROR("fcmp operand types must match!");
+ GEN_ERROR("fcmp operand types must match");
$$ = ConstantExpr::getFCmp($2, $4, $6);
}
- | ShiftOps '(' ConstVal ',' ConstVal ')' {
- if ($5->getType() != Type::Int8Ty)
- GEN_ERROR("Shift count for shift constant must be i8 type!");
- if (!$3->getType()->isInteger())
- GEN_ERROR("Shift constant expression requires integer operand!");
- CHECK_FOR_ERROR;
- $$ = ConstantExpr::get($1, $3, $5);
- CHECK_FOR_ERROR
- }
| EXTRACTELEMENT '(' ConstVal ',' ConstVal ')' {
if (!ExtractElementInst::isValidOperands($3, $5))
- GEN_ERROR("Invalid extractelement operands!");
+ GEN_ERROR("Invalid extractelement operands");
$$ = ConstantExpr::getExtractElement($3, $5);
CHECK_FOR_ERROR
}
| INSERTELEMENT '(' ConstVal ',' ConstVal ',' ConstVal ')' {
if (!InsertElementInst::isValidOperands($3, $5, $7))
- GEN_ERROR("Invalid insertelement operands!");
+ GEN_ERROR("Invalid insertelement operands");
$$ = ConstantExpr::getInsertElement($3, $5, $7);
CHECK_FOR_ERROR
}
| SHUFFLEVECTOR '(' ConstVal ',' ConstVal ',' ConstVal ')' {
if (!ShuffleVectorInst::isValidOperands($3, $5, $7))
- GEN_ERROR("Invalid shufflevector operands!");
+ GEN_ERROR("Invalid shufflevector operands");
$$ = ConstantExpr::getShuffleVector($3, $5, $7);
CHECK_FOR_ERROR
};
// GlobalType - Match either GLOBAL or CONSTANT for global declarations...
GlobalType : GLOBAL { $$ = false; } | CONSTANT { $$ = true; };
+// ThreadLocal
+ThreadLocal : THREAD_LOCAL { $$ = true; } | { $$ = false; };
+
+// AliaseeRef - Match either GlobalValue or bitcast to GlobalValue.
+AliaseeRef : ResultTypes SymbolicValueRef {
+ const Type* VTy = $1->get();
+ Value *V = getVal(VTy, $2);
+ CHECK_FOR_ERROR
+ GlobalValue* Aliasee = dyn_cast<GlobalValue>(V);
+ if (!Aliasee)
+ GEN_ERROR("Aliases can be created only to global values");
+
+ $$ = Aliasee;
+ CHECK_FOR_ERROR
+ delete $1;
+ }
+ | BITCAST '(' AliaseeRef TO Types ')' {
+ Constant *Val = $3;
+ const Type *DestTy = $5->get();
+ if (!CastInst::castIsValid($1, $3, DestTy))
+ GEN_ERROR("invalid cast opcode for cast from '" +
+ Val->getType()->getDescription() + "' to '" +
+ DestTy->getDescription() + "'");
+
+ $$ = ConstantExpr::getCast($1, $3, DestTy);
+ CHECK_FOR_ERROR
+ delete $5;
+ };
//===----------------------------------------------------------------------===//
// Rules to match Modules
;
Definition
- : DEFINE { CurFun.isDeclare = false } Function {
+ : DEFINE { CurFun.isDeclare = false; } Function {
CurFun.FunctionDone();
CHECK_FOR_ERROR
}
| MODULE ASM_TOK AsmBlock {
CHECK_FOR_ERROR
}
- | IMPLEMENTATION {
- // Emit an error if there are any unresolved types left.
- if (!CurModule.LateResolveTypes.empty()) {
- const ValID &DID = CurModule.LateResolveTypes.begin()->first;
- if (DID.Type == ValID::NameVal) {
- GEN_ERROR("Reference to an undefined type: '"+DID.getName() + "'");
- } else {
- GEN_ERROR("Reference to an undefined type: #" + itostr(DID.Num));
- }
- }
- CHECK_FOR_ERROR
- }
- | OptAssign TYPE Types {
+ | OptLocalAssign TYPE Types {
if (!UpRefs.empty())
GEN_ERROR("Invalid upreference in type: " + (*$3)->getDescription());
// Eagerly resolve types. This is not an optimization, this is a
delete $3;
CHECK_FOR_ERROR
}
- | OptAssign TYPE VOID {
+ | OptLocalAssign TYPE VOID {
ResolveTypeTo($1, $3);
if (!setTypeName($3, $1) && !$1) {
}
CHECK_FOR_ERROR
}
- | OptAssign GlobalType ConstVal { /* "Externally Visible" Linkage */
- if ($3 == 0)
- GEN_ERROR("Global value initializer is not a constant!");
- CurGV = ParseGlobalVariable($1, GlobalValue::ExternalLinkage, $2,
- $3->getType(), $3);
+ | OptGlobalAssign GVVisibilityStyle ThreadLocal GlobalType ConstVal
+ OptAddrSpace {
+ /* "Externally Visible" Linkage */
+ if ($5 == 0)
+ GEN_ERROR("Global value initializer is not a constant");
+ CurGV = ParseGlobalVariable($1, GlobalValue::ExternalLinkage,
+ $2, $4, $5->getType(), $5, $3, $6);
CHECK_FOR_ERROR
} GlobalVarAttributes {
CurGV = 0;
}
- | OptAssign GVInternalLinkage GlobalType ConstVal {
- if ($4 == 0)
- GEN_ERROR("Global value initializer is not a constant!");
- CurGV = ParseGlobalVariable($1, $2, $3, $4->getType(), $4);
+ | OptGlobalAssign GVInternalLinkage GVVisibilityStyle ThreadLocal GlobalType
+ ConstVal OptAddrSpace {
+ if ($6 == 0)
+ GEN_ERROR("Global value initializer is not a constant");
+ CurGV = ParseGlobalVariable($1, $2, $3, $5, $6->getType(), $6, $4, $7);
CHECK_FOR_ERROR
} GlobalVarAttributes {
CurGV = 0;
}
- | OptAssign GVExternalLinkage GlobalType Types {
+ | OptGlobalAssign GVExternalLinkage GVVisibilityStyle ThreadLocal GlobalType
+ Types OptAddrSpace {
if (!UpRefs.empty())
- GEN_ERROR("Invalid upreference in type: " + (*$4)->getDescription());
- CurGV = ParseGlobalVariable($1, $2, $3, *$4, 0);
+ GEN_ERROR("Invalid upreference in type: " + (*$6)->getDescription());
+ CurGV = ParseGlobalVariable($1, $2, $3, $5, *$6, 0, $4, $7);
CHECK_FOR_ERROR
- delete $4;
+ delete $6;
} GlobalVarAttributes {
CurGV = 0;
CHECK_FOR_ERROR
}
+ | OptGlobalAssign GVVisibilityStyle ALIAS AliasLinkage AliaseeRef {
+ std::string Name;
+ if ($1) {
+ Name = *$1;
+ delete $1;
+ }
+ if (Name.empty())
+ GEN_ERROR("Alias name cannot be empty");
+
+ Constant* Aliasee = $5;
+ if (Aliasee == 0)
+ GEN_ERROR(std::string("Invalid aliasee for alias: ") + Name);
+
+ GlobalAlias* GA = new GlobalAlias(Aliasee->getType(), $4, Name, Aliasee,
+ CurModule.CurrentModule);
+ GA->setVisibility($2);
+ InsertValue(GA, CurModule.Values);
+
+
+ // If there was a forward reference of this alias, resolve it now.
+
+ ValID ID;
+ if (!Name.empty())
+ ID = ValID::createGlobalName(Name);
+ else
+ ID = ValID::createGlobalID(CurModule.Values.size()-1);
+
+ if (GlobalValue *FWGV =
+ CurModule.GetForwardRefForGlobal(GA->getType(), ID)) {
+ // Replace uses of the fwdref with the actual alias.
+ FWGV->replaceAllUsesWith(GA);
+ if (GlobalVariable *GV = dyn_cast<GlobalVariable>(FWGV))
+ GV->eraseFromParent();
+ else
+ cast<Function>(FWGV)->eraseFromParent();
+ }
+ ID.destroy();
+
+ CHECK_FOR_ERROR
+ }
| TARGET TargetDefinition {
CHECK_FOR_ERROR
}
AsmBlock : STRINGCONSTANT {
const std::string &AsmSoFar = CurModule.CurrentModule->getModuleInlineAsm();
- char *EndStr = UnEscapeLexed($1, true);
- std::string NewAsm($1, EndStr);
- free($1);
-
if (AsmSoFar.empty())
- CurModule.CurrentModule->setModuleInlineAsm(NewAsm);
+ CurModule.CurrentModule->setModuleInlineAsm(*$1);
else
- CurModule.CurrentModule->setModuleInlineAsm(AsmSoFar+"\n"+NewAsm);
+ CurModule.CurrentModule->setModuleInlineAsm(AsmSoFar+"\n"+*$1);
+ delete $1;
CHECK_FOR_ERROR
};
-BigOrLittle : BIG { $$ = Module::BigEndian; };
-BigOrLittle : LITTLE { $$ = Module::LittleEndian; };
-
-TargetDefinition : ENDIAN '=' BigOrLittle {
- CurModule.CurrentModule->setEndianness($3);
- CHECK_FOR_ERROR
- }
- | POINTERSIZE '=' EUINT64VAL {
- if ($3 == 32)
- CurModule.CurrentModule->setPointerSize(Module::Pointer32);
- else if ($3 == 64)
- CurModule.CurrentModule->setPointerSize(Module::Pointer64);
- else
- GEN_ERROR("Invalid pointer size: '" + utostr($3) + "'!");
- CHECK_FOR_ERROR
- }
- | TRIPLE '=' STRINGCONSTANT {
- CurModule.CurrentModule->setTargetTriple($3);
- free($3);
+TargetDefinition : TRIPLE '=' STRINGCONSTANT {
+ CurModule.CurrentModule->setTargetTriple(*$3);
+ delete $3;
}
| DATALAYOUT '=' STRINGCONSTANT {
- CurModule.CurrentModule->setDataLayout($3);
- free($3);
+ CurModule.CurrentModule->setDataLayout(*$3);
+ delete $3;
};
LibrariesDefinition : '[' LibList ']';
LibList : LibList ',' STRINGCONSTANT {
- CurModule.CurrentModule->addLibrary($3);
- free($3);
+ CurModule.CurrentModule->addLibrary(*$3);
+ delete $3;
CHECK_FOR_ERROR
}
| STRINGCONSTANT {
- CurModule.CurrentModule->addLibrary($1);
- free($1);
+ CurModule.CurrentModule->addLibrary(*$1);
+ delete $1;
CHECK_FOR_ERROR
}
| /* empty: end of list */ {
// Rules to match Function Headers
//===----------------------------------------------------------------------===//
-Name : VAR_ID | STRINGCONSTANT;
-OptName : Name | /*empty*/ { $$ = 0; };
-
-ArgListH : ArgListH ',' Types OptParamAttrs OptName {
+ArgListH : ArgListH ',' Types OptParamAttrs OptLocalName {
if (!UpRefs.empty())
GEN_ERROR("Invalid upreference in type: " + (*$3)->getDescription());
if (*$3 == Type::VoidTy)
- GEN_ERROR("void typed arguments are invalid!");
+ GEN_ERROR("void typed arguments are invalid");
ArgListEntry E; E.Attrs = $4; E.Ty = $3; E.Name = $5;
$$ = $1;
$1->push_back(E);
CHECK_FOR_ERROR
}
- | Types OptParamAttrs OptName {
+ | Types OptParamAttrs OptLocalName {
if (!UpRefs.empty())
GEN_ERROR("Invalid upreference in type: " + (*$1)->getDescription());
if (*$1 == Type::VoidTy)
- GEN_ERROR("void typed arguments are invalid!");
+ GEN_ERROR("void typed arguments are invalid");
ArgListEntry E; E.Attrs = $2; E.Ty = $1; E.Name = $3;
$$ = new ArgListType;
$$->push_back(E);
struct ArgListEntry E;
E.Ty = new PATypeHolder(Type::VoidTy);
E.Name = 0;
- E.Attrs = FunctionType::NoAttributeSet;
+ E.Attrs = ParamAttr::None;
$$->push_back(E);
CHECK_FOR_ERROR
}
struct ArgListEntry E;
E.Ty = new PATypeHolder(Type::VoidTy);
E.Name = 0;
- E.Attrs = FunctionType::NoAttributeSet;
+ E.Attrs = ParamAttr::None;
$$->push_back(E);
CHECK_FOR_ERROR
}
CHECK_FOR_ERROR
};
-FunctionHeaderH : OptCallingConv ResultTypes Name '(' ArgList ')'
- OptFuncAttrs OptSection OptAlign {
- UnEscapeLexed($3);
- std::string FunctionName($3);
- free($3); // Free strdup'd memory!
+FunctionHeaderH : OptCallingConv ResultTypes GlobalName '(' ArgList ')'
+ OptFuncAttrs OptSection OptAlign OptGC {
+ std::string FunctionName(*$3);
+ delete $3; // Free strdup'd memory!
// Check the function result for abstractness if this is a define. We should
// have no abstract types at this point
GEN_ERROR("Reference to abstract result: "+ $2->get()->getDescription());
std::vector<const Type*> ParamTypeList;
- std::vector<FunctionType::ParameterAttributes> ParamAttrs;
- ParamAttrs.push_back($7);
+ ParamAttrsVector Attrs;
+ if ($7 != ParamAttr::None) {
+ ParamAttrsWithIndex PAWI;
+ PAWI.index = 0;
+ PAWI.attrs = $7;
+ Attrs.push_back(PAWI);
+ }
if ($5) { // If there are arguments...
- for (ArgListType::iterator I = $5->begin(); I != $5->end(); ++I) {
+ unsigned index = 1;
+ for (ArgListType::iterator I = $5->begin(); I != $5->end(); ++I, ++index) {
const Type* Ty = I->Ty->get();
if (!CurFun.isDeclare && CurModule.TypeIsUnresolved(I->Ty))
GEN_ERROR("Reference to abstract argument: " + Ty->getDescription());
ParamTypeList.push_back(Ty);
if (Ty != Type::VoidTy)
- ParamAttrs.push_back(I->Attrs);
+ if (I->Attrs != ParamAttr::None) {
+ ParamAttrsWithIndex PAWI;
+ PAWI.index = index;
+ PAWI.attrs = I->Attrs;
+ Attrs.push_back(PAWI);
+ }
}
}
bool isVarArg = ParamTypeList.size() && ParamTypeList.back() == Type::VoidTy;
if (isVarArg) ParamTypeList.pop_back();
- FunctionType *FT = FunctionType::get(*$2, ParamTypeList, isVarArg,
- ParamAttrs);
- const PointerType *PFT = PointerType::get(FT);
+ const ParamAttrsList *PAL = 0;
+ if (!Attrs.empty())
+ PAL = ParamAttrsList::get(Attrs);
+
+ FunctionType *FT = FunctionType::get(*$2, ParamTypeList, isVarArg);
+ const PointerType *PFT = PointerType::getUnqual(FT);
delete $2;
ValID ID;
if (!FunctionName.empty()) {
- ID = ValID::create((char*)FunctionName.c_str());
+ ID = ValID::createGlobalName((char*)FunctionName.c_str());
} else {
- ID = ValID::create((int)CurModule.Values[PFT].size());
+ ID = ValID::createGlobalID(CurModule.Values.size());
}
Function *Fn = 0;
// Move the function to the end of the list, from whereever it was
// previously inserted.
Fn = cast<Function>(FWRef);
+ assert(!Fn->getParamAttrs() && "Forward reference has parameter attributes!");
CurModule.CurrentModule->getFunctionList().remove(Fn);
CurModule.CurrentModule->getFunctionList().push_back(Fn);
} else if (!FunctionName.empty() && // Merge with an earlier prototype?
- (Fn = CurModule.CurrentModule->getFunction(FunctionName, FT))) {
- // If this is the case, either we need to be a forward decl, or it needs
- // to be.
- if (!CurFun.isDeclare && !Fn->isExternal())
- GEN_ERROR("Redefinition of function '" + FunctionName + "'!");
-
- // Make sure to strip off any argument names so we can't get conflicts.
- if (Fn->isExternal())
+ (Fn = CurModule.CurrentModule->getFunction(FunctionName))) {
+ if (Fn->getFunctionType() != FT ) {
+ // The existing function doesn't have the same type. This is an overload
+ // error.
+ GEN_ERROR("Overload of function '" + FunctionName + "' not permitted.");
+ } else if (Fn->getParamAttrs() != PAL) {
+ // The existing function doesn't have the same parameter attributes.
+ // This is an overload error.
+ GEN_ERROR("Overload of function '" + FunctionName + "' not permitted.");
+ } else if (!CurFun.isDeclare && !Fn->isDeclaration()) {
+ // Neither the existing or the current function is a declaration and they
+ // have the same name and same type. Clearly this is a redefinition.
+ GEN_ERROR("Redefinition of function '" + FunctionName + "'");
+ } else if (Fn->isDeclaration()) {
+ // Make sure to strip off any argument names so we can't get conflicts.
for (Function::arg_iterator AI = Fn->arg_begin(), AE = Fn->arg_end();
AI != AE; ++AI)
AI->setName("");
+ }
} else { // Not already defined?
- Fn = new Function(FT, GlobalValue::ExternalLinkage, FunctionName,
+ Fn = new Function(FT, GlobalValue::ExternalWeakLinkage, FunctionName,
CurModule.CurrentModule);
-
InsertValue(Fn, CurModule.Values);
}
// correctly handle cases, when pointer to function is passed as argument to
// another function.
Fn->setLinkage(CurFun.Linkage);
+ Fn->setVisibility(CurFun.Visibility);
}
Fn->setCallingConv($1);
+ Fn->setParamAttrs(PAL);
Fn->setAlignment($9);
if ($8) {
- Fn->setSection($8);
- free($8);
+ Fn->setSection(*$8);
+ delete $8;
+ }
+ if ($10) {
+ Fn->setCollector($10->c_str());
+ delete $10;
}
// Add all of the arguments we parsed to the function...
if ($5) { // Is null if empty...
if (isVarArg) { // Nuke the last entry
- assert($5->back().Ty->get() == Type::VoidTy && $5->back().Name == 0&&
+ assert($5->back().Ty->get() == Type::VoidTy && $5->back().Name == 0 &&
"Not a varargs marker!");
delete $5->back().Ty;
$5->pop_back(); // Delete the last entry
}
Function::arg_iterator ArgIt = Fn->arg_begin();
+ Function::arg_iterator ArgEnd = Fn->arg_end();
unsigned Idx = 1;
- for (ArgListType::iterator I = $5->begin(); I != $5->end(); ++I, ++ArgIt) {
+ for (ArgListType::iterator I = $5->begin();
+ I != $5->end() && ArgIt != ArgEnd; ++I, ++ArgIt) {
delete I->Ty; // Delete the typeholder...
- setValueName(ArgIt, I->Name); // Insert arg into symtab...
+ setValueName(ArgIt, I->Name); // Insert arg into symtab...
CHECK_FOR_ERROR
InsertValue(ArgIt);
Idx++;
BEGIN : BEGINTOK | '{'; // Allow BEGIN or '{' to start a function
-FunctionHeader : FunctionDefineLinkage FunctionHeaderH BEGIN {
+FunctionHeader : FunctionDefineLinkage GVVisibilityStyle FunctionHeaderH BEGIN {
$$ = CurFun.CurrentFunction;
// Make sure that we keep track of the linkage type even if there was a
// previous "declare".
$$->setLinkage($1);
+ $$->setVisibility($2);
};
END : ENDTOK | '}'; // Allow end of '}' to end a function
CHECK_FOR_ERROR
};
-FunctionProto : FunctionDeclareLinkage FunctionHeaderH {
+FunctionProto : FunctionDeclareLinkage GVVisibilityStyle FunctionHeaderH {
CurFun.CurrentFunction->setLinkage($1);
+ CurFun.CurrentFunction->setVisibility($2);
$$ = CurFun.CurrentFunction;
CurFun.FunctionDone();
CHECK_FOR_ERROR
CHECK_FOR_ERROR
}
| TRUETOK {
- $$ = ValID::create(ConstantBool::getTrue());
+ $$ = ValID::create(ConstantInt::getTrue());
CHECK_FOR_ERROR
}
| FALSETOK {
- $$ = ValID::create(ConstantBool::getFalse());
+ $$ = ValID::create(ConstantInt::getFalse());
CHECK_FOR_ERROR
}
| NULL_TOK {
const Type *ETy = (*$2)[0]->getType();
int NumElements = $2->size();
- PackedType* pt = PackedType::get(ETy, NumElements);
+ VectorType* pt = VectorType::get(ETy, NumElements);
PATypeHolder* PTy = new PATypeHolder(
HandleUpRefs(
- PackedType::get(
+ VectorType::get(
ETy,
NumElements)
)
(*$2)[i]->getType()->getDescription() + "'.");
}
- $$ = ValID::create(ConstantPacked::get(pt, *$2));
+ $$ = ValID::create(ConstantVector::get(pt, *$2));
delete PTy; delete $2;
CHECK_FOR_ERROR
}
CHECK_FOR_ERROR
}
| ASM_TOK OptSideEffect STRINGCONSTANT ',' STRINGCONSTANT {
- char *End = UnEscapeLexed($3, true);
- std::string AsmStr = std::string($3, End);
- End = UnEscapeLexed($5, true);
- std::string Constraints = std::string($5, End);
- $$ = ValID::createInlineAsm(AsmStr, Constraints, $2);
- free($3);
- free($5);
+ $$ = ValID::createInlineAsm(*$3, *$5, $2);
+ delete $3;
+ delete $5;
CHECK_FOR_ERROR
};
// SymbolicValueRef - Reference to one of two ways of symbolically refering to
// another value.
//
-SymbolicValueRef : INTVAL { // Is it an integer reference...?
- $$ = ValID::create($1);
+SymbolicValueRef : LOCALVAL_ID { // Is it an integer reference...?
+ $$ = ValID::createLocalID($1);
CHECK_FOR_ERROR
}
- | Name { // Is it a named reference...?
- $$ = ValID::create($1);
+ | GLOBALVAL_ID {
+ $$ = ValID::createGlobalID($1);
+ CHECK_FOR_ERROR
+ }
+ | LocalName { // Is it a named reference...?
+ $$ = ValID::createLocalName(*$1);
+ delete $1;
+ CHECK_FOR_ERROR
+ }
+ | GlobalName { // Is it a named reference...?
+ $$ = ValID::createGlobalName(*$1);
+ delete $1;
CHECK_FOR_ERROR
};
// Basic blocks are terminated by branching instructions:
// br, br/cc, switch, ret
//
-BasicBlock : InstructionList OptAssign BBTerminatorInst {
+BasicBlock : InstructionList OptLocalAssign BBTerminatorInst {
setValueName($3, $2);
CHECK_FOR_ERROR
InsertValue($3);
-
$1->getInstList().push_back($3);
- InsertValue($1);
$$ = $1;
CHECK_FOR_ERROR
};
$$ = $1;
CHECK_FOR_ERROR
}
- | /* empty */ {
- $$ = getBBVal(ValID::create((int)CurFun.NextBBNum++), true);
- CHECK_FOR_ERROR
-
- // Make sure to move the basic block to the correct location in the
- // function, instead of leaving it inserted wherever it was first
- // referenced.
- Function::BasicBlockListType &BBL =
- CurFun.CurrentFunction->getBasicBlockList();
- BBL.splice(BBL.end(), BBL, $$);
+ | /* empty */ { // Empty space between instruction lists
+ $$ = defineBBVal(ValID::createLocalID(CurFun.NextValNum));
CHECK_FOR_ERROR
}
- | LABELSTR {
- $$ = getBBVal(ValID::create($1), true);
+ | LABELSTR { // Labelled (named) basic block
+ $$ = defineBBVal(ValID::createLocalName(*$1));
+ delete $1;
CHECK_FOR_ERROR
- // Make sure to move the basic block to the correct location in the
- // function, instead of leaving it inserted wherever it was first
- // referenced.
- Function::BasicBlockListType &BBL =
- CurFun.CurrentFunction->getBasicBlockList();
- BBL.splice(BBL.end(), BBL, $$);
- CHECK_FOR_ERROR
};
BBTerminatorInst : RET ResolvedVal { // Return with a result...
$$ = new ReturnInst($2);
CHECK_FOR_ERROR
}
- | RET VOID { // Return with no result...
+ | RET VOID { // Return with no result...
$$ = new ReturnInst();
CHECK_FOR_ERROR
}
- | BR LABEL ValueRef { // Unconditional Branch...
+ | BR LABEL ValueRef { // Unconditional Branch...
BasicBlock* tmpBB = getBBVal($3);
CHECK_FOR_ERROR
$$ = new BranchInst(tmpBB);
- } // Conditional Branch...
- | BR BOOL ValueRef ',' LABEL ValueRef ',' LABEL ValueRef {
+ } // Conditional Branch...
+ | BR INTTYPE ValueRef ',' LABEL ValueRef ',' LABEL ValueRef {
+ assert(cast<IntegerType>($2)->getBitWidth() == 1 && "Not Bool?");
BasicBlock* tmpBBA = getBBVal($6);
CHECK_FOR_ERROR
BasicBlock* tmpBBB = getBBVal($9);
CHECK_FOR_ERROR
- Value* tmpVal = getVal(Type::BoolTy, $3);
+ Value* tmpVal = getVal(Type::Int1Ty, $3);
CHECK_FOR_ERROR
$$ = new BranchInst(tmpBBA, tmpBBB, tmpVal);
}
if (ConstantInt *CI = dyn_cast<ConstantInt>(I->first))
S->addCase(CI, I->second);
else
- GEN_ERROR("Switch case is constant, but not a simple integer!");
+ GEN_ERROR("Switch case is constant, but not a simple integer");
}
delete $8;
CHECK_FOR_ERROR
$$ = S;
CHECK_FOR_ERROR
}
- | INVOKE OptCallingConv ResultTypes ValueRef '(' ValueRefList ')' OptFuncAttrs
+ | INVOKE OptCallingConv ResultTypes ValueRef '(' ParamList ')' OptFuncAttrs
TO LABEL ValueRef UNWIND LABEL ValueRef {
// Handle the short syntax
!(Ty = dyn_cast<FunctionType>(PFTy->getElementType()))) {
// Pull out the types of all of the arguments...
std::vector<const Type*> ParamTypes;
- FunctionType::ParamAttrsList ParamAttrs;
- ParamAttrs.push_back($8);
- for (ValueRefList::iterator I = $6->begin(), E = $6->end(); I != E; ++I) {
+ ParamList::iterator I = $6->begin(), E = $6->end();
+ for (; I != E; ++I) {
const Type *Ty = I->Val->getType();
if (Ty == Type::VoidTy)
GEN_ERROR("Short call syntax cannot be used with varargs");
ParamTypes.push_back(Ty);
- ParamAttrs.push_back(I->Attrs);
}
-
- Ty = FunctionType::get($3->get(), ParamTypes, false, ParamAttrs);
- PFTy = PointerType::get(Ty);
+ Ty = FunctionType::get($3->get(), ParamTypes, false);
+ PFTy = PointerType::getUnqual(Ty);
}
+ delete $3;
+
Value *V = getVal(PFTy, $4); // Get the function we're calling...
CHECK_FOR_ERROR
BasicBlock *Normal = getBBVal($11);
BasicBlock *Except = getBBVal($14);
CHECK_FOR_ERROR
+ ParamAttrsVector Attrs;
+ if ($8 != ParamAttr::None) {
+ ParamAttrsWithIndex PAWI; PAWI.index = 0; PAWI.attrs = $8;
+ Attrs.push_back(PAWI);
+ }
+
// Check the arguments
ValueList Args;
if ($6->empty()) { // Has no arguments?
// Make sure no arguments is a good thing!
if (Ty->getNumParams() != 0)
GEN_ERROR("No arguments passed to a function that "
- "expects arguments!");
+ "expects arguments");
} else { // Has arguments?
// Loop through FunctionType's arguments and ensure they are specified
// correctly!
FunctionType::param_iterator I = Ty->param_begin();
FunctionType::param_iterator E = Ty->param_end();
- ValueRefList::iterator ArgI = $6->begin(), ArgE = $6->end();
+ ParamList::iterator ArgI = $6->begin(), ArgE = $6->end();
+ unsigned index = 1;
- for (; ArgI != ArgE && I != E; ++ArgI, ++I) {
+ for (; ArgI != ArgE && I != E; ++ArgI, ++I, ++index) {
if (ArgI->Val->getType() != *I)
GEN_ERROR("Parameter " + ArgI->Val->getName()+ " is not of type '" +
- (*I)->getDescription() + "'!");
+ (*I)->getDescription() + "'");
Args.push_back(ArgI->Val);
+ if (ArgI->Attrs != ParamAttr::None) {
+ ParamAttrsWithIndex PAWI;
+ PAWI.index = index;
+ PAWI.attrs = ArgI->Attrs;
+ Attrs.push_back(PAWI);
+ }
}
if (Ty->isVarArg()) {
for (; ArgI != ArgE; ++ArgI)
Args.push_back(ArgI->Val); // push the remaining varargs
} else if (I != E || ArgI != ArgE)
- GEN_ERROR("Invalid number of parameters detected!");
+ GEN_ERROR("Invalid number of parameters detected");
}
+ const ParamAttrsList *PAL = 0;
+ if (!Attrs.empty())
+ PAL = ParamAttrsList::get(Attrs);
+
// Create the InvokeInst
- InvokeInst *II = new InvokeInst(V, Normal, Except, Args);
+ InvokeInst *II = new InvokeInst(V, Normal, Except, Args.begin(), Args.end());
II->setCallingConv($2);
+ II->setParamAttrs(PAL);
$$ = II;
delete $6;
CHECK_FOR_ERROR
JumpTable : JumpTable IntType ConstValueRef ',' LABEL ValueRef {
$$ = $1;
- Constant *V = cast<Constant>(getValNonImprovising($2, $3));
+ Constant *V = cast<Constant>(getExistingVal($2, $3));
CHECK_FOR_ERROR
if (V == 0)
- GEN_ERROR("May only switch on a constant pool value!");
+ GEN_ERROR("May only switch on a constant pool value");
BasicBlock* tmpBB = getBBVal($6);
CHECK_FOR_ERROR
}
| IntType ConstValueRef ',' LABEL ValueRef {
$$ = new std::vector<std::pair<Constant*, BasicBlock*> >();
- Constant *V = cast<Constant>(getValNonImprovising($1, $2));
+ Constant *V = cast<Constant>(getExistingVal($1, $2));
CHECK_FOR_ERROR
if (V == 0)
- GEN_ERROR("May only switch on a constant pool value!");
+ GEN_ERROR("May only switch on a constant pool value");
BasicBlock* tmpBB = getBBVal($5);
CHECK_FOR_ERROR
$$->push_back(std::make_pair(V, tmpBB));
};
-Inst : OptAssign InstVal {
- // Is this definition named?? if so, assign the name...
- setValueName($2, $1);
- CHECK_FOR_ERROR
- InsertValue($2);
- $$ = $2;
- CHECK_FOR_ERROR
-};
+Inst : OptLocalAssign InstVal {
+ // Is this definition named?? if so, assign the name...
+ setValueName($2, $1);
+ CHECK_FOR_ERROR
+ InsertValue($2);
+ $$ = $2;
+ CHECK_FOR_ERROR
+ };
+
PHIList : Types '[' ValueRef ',' ValueRef ']' { // Used for PHI nodes
if (!UpRefs.empty())
};
-ValueRefList : Types ValueRef OptParamAttrs {
+ParamList : Types OptParamAttrs ValueRef OptParamAttrs {
+ // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0
if (!UpRefs.empty())
GEN_ERROR("Invalid upreference in type: " + (*$1)->getDescription());
// Used for call and invoke instructions
- $$ = new ValueRefList();
- ValueRefListEntry E; E.Attrs = $3; E.Val = getVal($1->get(), $2);
+ $$ = new ParamList();
+ ParamListEntry E; E.Attrs = $2 | $4; E.Val = getVal($1->get(), $3);
+ $$->push_back(E);
+ delete $1;
+ CHECK_FOR_ERROR
+ }
+ | LABEL OptParamAttrs ValueRef OptParamAttrs {
+ // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0
+ // Labels are only valid in ASMs
+ $$ = new ParamList();
+ ParamListEntry E; E.Attrs = $2 | $4; E.Val = getBBVal($3);
$$->push_back(E);
+ CHECK_FOR_ERROR
}
- | ValueRefList ',' Types ValueRef OptParamAttrs {
+ | ParamList ',' Types OptParamAttrs ValueRef OptParamAttrs {
+ // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0
if (!UpRefs.empty())
GEN_ERROR("Invalid upreference in type: " + (*$3)->getDescription());
$$ = $1;
- ValueRefListEntry E; E.Attrs = $5; E.Val = getVal($3->get(), $4);
+ ParamListEntry E; E.Attrs = $4 | $6; E.Val = getVal($3->get(), $5);
$$->push_back(E);
+ delete $3;
CHECK_FOR_ERROR
}
- | /*empty*/ { $$ = new ValueRefList(); };
+ | ParamList ',' LABEL OptParamAttrs ValueRef OptParamAttrs {
+ // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0
+ $$ = $1;
+ ParamListEntry E; E.Attrs = $4 | $6; E.Val = getBBVal($5);
+ $$->push_back(E);
+ CHECK_FOR_ERROR
+ }
+ | /*empty*/ { $$ = new ParamList(); };
IndexList // Used for gep instructions and constant expressions
: /*empty*/ { $$ = new std::vector<Value*>(); }
if (!UpRefs.empty())
GEN_ERROR("Invalid upreference in type: " + (*$2)->getDescription());
if (!(*$2)->isInteger() && !(*$2)->isFloatingPoint() &&
- !isa<PackedType>((*$2).get()))
+ !isa<VectorType>((*$2).get()))
GEN_ERROR(
- "Arithmetic operator requires integer, FP, or packed operands!");
- if (isa<PackedType>((*$2).get()) &&
- ($1 == Instruction::URem ||
- $1 == Instruction::SRem ||
- $1 == Instruction::FRem))
- GEN_ERROR("U/S/FRem not supported on packed types!");
+ "Arithmetic operator requires integer, FP, or packed operands");
Value* val1 = getVal(*$2, $3);
CHECK_FOR_ERROR
Value* val2 = getVal(*$2, $5);
CHECK_FOR_ERROR
$$ = BinaryOperator::create($1, val1, val2);
if ($$ == 0)
- GEN_ERROR("binary operator returned null!");
+ GEN_ERROR("binary operator returned null");
delete $2;
}
| LogicalOps Types ValueRef ',' ValueRef {
if (!UpRefs.empty())
GEN_ERROR("Invalid upreference in type: " + (*$2)->getDescription());
- if (!(*$2)->isIntegral()) {
- if (!isa<PackedType>($2->get()) ||
- !cast<PackedType>($2->get())->getElementType()->isIntegral())
- GEN_ERROR("Logical operator requires integral operands!");
+ if (!(*$2)->isInteger()) {
+ if (Instruction::isShift($1) || !isa<VectorType>($2->get()) ||
+ !cast<VectorType>($2->get())->getElementType()->isInteger())
+ GEN_ERROR("Logical operator requires integral operands");
}
Value* tmpVal1 = getVal(*$2, $3);
CHECK_FOR_ERROR
CHECK_FOR_ERROR
$$ = BinaryOperator::create($1, tmpVal1, tmpVal2);
if ($$ == 0)
- GEN_ERROR("binary operator returned null!");
+ GEN_ERROR("binary operator returned null");
delete $2;
}
| ICMP IPredicates Types ValueRef ',' ValueRef {
if (!UpRefs.empty())
GEN_ERROR("Invalid upreference in type: " + (*$3)->getDescription());
- if (isa<PackedType>((*$3).get()))
- GEN_ERROR("Packed types not supported by icmp instruction");
+ if (isa<VectorType>((*$3).get()))
+ GEN_ERROR("Vector types not supported by icmp instruction");
Value* tmpVal1 = getVal(*$3, $4);
CHECK_FOR_ERROR
Value* tmpVal2 = getVal(*$3, $6);
CHECK_FOR_ERROR
$$ = CmpInst::create($1, $2, tmpVal1, tmpVal2);
if ($$ == 0)
- GEN_ERROR("icmp operator returned null!");
+ GEN_ERROR("icmp operator returned null");
+ delete $3;
}
| FCMP FPredicates Types ValueRef ',' ValueRef {
if (!UpRefs.empty())
GEN_ERROR("Invalid upreference in type: " + (*$3)->getDescription());
- if (isa<PackedType>((*$3).get()))
- GEN_ERROR("Packed types not supported by fcmp instruction");
+ if (isa<VectorType>((*$3).get()))
+ GEN_ERROR("Vector types not supported by fcmp instruction");
Value* tmpVal1 = getVal(*$3, $4);
CHECK_FOR_ERROR
Value* tmpVal2 = getVal(*$3, $6);
CHECK_FOR_ERROR
$$ = CmpInst::create($1, $2, tmpVal1, tmpVal2);
if ($$ == 0)
- GEN_ERROR("fcmp operator returned null!");
- }
- | NOT ResolvedVal {
- cerr << "WARNING: Use of eliminated 'not' instruction:"
- << " Replacing with 'xor'.\n";
-
- Value *Ones = ConstantIntegral::getAllOnesValue($2->getType());
- if (Ones == 0)
- GEN_ERROR("Expected integral type for not instruction!");
-
- $$ = BinaryOperator::create(Instruction::Xor, $2, Ones);
- if ($$ == 0)
- GEN_ERROR("Could not create a xor instruction!");
- CHECK_FOR_ERROR
- }
- | ShiftOps ResolvedVal ',' ResolvedVal {
- if ($4->getType() != Type::Int8Ty)
- GEN_ERROR("Shift amount must be i8 type!");
- if (!$2->getType()->isInteger())
- GEN_ERROR("Shift constant expression requires integer operand!");
- CHECK_FOR_ERROR;
- $$ = new ShiftInst($1, $2, $4);
- CHECK_FOR_ERROR
+ GEN_ERROR("fcmp operator returned null");
+ delete $3;
}
| CastOps ResolvedVal TO Types {
if (!UpRefs.empty())
GEN_ERROR("Invalid upreference in type: " + (*$4)->getDescription());
Value* Val = $2;
- const Type* Ty = $4->get();
- if (!Val->getType()->isFirstClassType())
- GEN_ERROR("cast from a non-primitive type: '" +
- Val->getType()->getDescription() + "'!");
- if (!Ty->isFirstClassType())
- GEN_ERROR("cast to a non-primitive type: '" + Ty->getDescription() +"'!");
- $$ = CastInst::create($1, Val, $4->get());
+ const Type* DestTy = $4->get();
+ if (!CastInst::castIsValid($1, Val, DestTy))
+ GEN_ERROR("invalid cast opcode for cast from '" +
+ Val->getType()->getDescription() + "' to '" +
+ DestTy->getDescription() + "'");
+ $$ = CastInst::create($1, Val, DestTy);
delete $4;
}
| SELECT ResolvedVal ',' ResolvedVal ',' ResolvedVal {
- if ($2->getType() != Type::BoolTy)
- GEN_ERROR("select condition must be boolean!");
+ if ($2->getType() != Type::Int1Ty)
+ GEN_ERROR("select condition must be boolean");
if ($4->getType() != $6->getType())
- GEN_ERROR("select value types should match!");
+ GEN_ERROR("select value types should match");
$$ = new SelectInst($2, $4, $6);
CHECK_FOR_ERROR
}
}
| EXTRACTELEMENT ResolvedVal ',' ResolvedVal {
if (!ExtractElementInst::isValidOperands($2, $4))
- GEN_ERROR("Invalid extractelement operands!");
+ GEN_ERROR("Invalid extractelement operands");
$$ = new ExtractElementInst($2, $4);
CHECK_FOR_ERROR
}
| INSERTELEMENT ResolvedVal ',' ResolvedVal ',' ResolvedVal {
if (!InsertElementInst::isValidOperands($2, $4, $6))
- GEN_ERROR("Invalid insertelement operands!");
+ GEN_ERROR("Invalid insertelement operands");
$$ = new InsertElementInst($2, $4, $6);
CHECK_FOR_ERROR
}
| SHUFFLEVECTOR ResolvedVal ',' ResolvedVal ',' ResolvedVal {
if (!ShuffleVectorInst::isValidOperands($2, $4, $6))
- GEN_ERROR("Invalid shufflevector operands!");
+ GEN_ERROR("Invalid shufflevector operands");
$$ = new ShuffleVectorInst($2, $4, $6);
CHECK_FOR_ERROR
}
| PHI_TOK PHIList {
const Type *Ty = $2->front().first->getType();
if (!Ty->isFirstClassType())
- GEN_ERROR("PHI node operands must be of first class type!");
+ GEN_ERROR("PHI node operands must be of first class type");
$$ = new PHINode(Ty);
((PHINode*)$$)->reserveOperandSpace($2->size());
while ($2->begin() != $2->end()) {
if ($2->front().first->getType() != Ty)
- GEN_ERROR("All elements of a PHI node must be of the same type!");
+ GEN_ERROR("All elements of a PHI node must be of the same type");
cast<PHINode>($$)->addIncoming($2->front().first, $2->front().second);
$2->pop_front();
}
delete $2; // Free the list...
CHECK_FOR_ERROR
}
- | OptTailCall OptCallingConv ResultTypes ValueRef '(' ValueRefList ')'
+ | OptTailCall OptCallingConv ResultTypes ValueRef '(' ParamList ')'
OptFuncAttrs {
// Handle the short syntax
!(Ty = dyn_cast<FunctionType>(PFTy->getElementType()))) {
// Pull out the types of all of the arguments...
std::vector<const Type*> ParamTypes;
- FunctionType::ParamAttrsList ParamAttrs;
- ParamAttrs.push_back($8);
- for (ValueRefList::iterator I = $6->begin(), E = $6->end(); I != E; ++I) {
+ ParamList::iterator I = $6->begin(), E = $6->end();
+ for (; I != E; ++I) {
const Type *Ty = I->Val->getType();
if (Ty == Type::VoidTy)
GEN_ERROR("Short call syntax cannot be used with varargs");
ParamTypes.push_back(Ty);
- ParamAttrs.push_back(I->Attrs);
}
-
- Ty = FunctionType::get($3->get(), ParamTypes, false, ParamAttrs);
- PFTy = PointerType::get(Ty);
+ Ty = FunctionType::get($3->get(), ParamTypes, false);
+ PFTy = PointerType::getUnqual(Ty);
}
Value *V = getVal(PFTy, $4); // Get the function we're calling...
CHECK_FOR_ERROR
+ // Check for call to invalid intrinsic to avoid crashing later.
+ if (Function *theF = dyn_cast<Function>(V)) {
+ if (theF->hasName() && (theF->getValueName()->getKeyLength() >= 5) &&
+ (0 == strncmp(theF->getValueName()->getKeyData(), "llvm.", 5)) &&
+ !theF->getIntrinsicID(true))
+ GEN_ERROR("Call to invalid LLVM intrinsic function '" +
+ theF->getName() + "'");
+ }
+
+ // Set up the ParamAttrs for the function
+ ParamAttrsVector Attrs;
+ if ($8 != ParamAttr::None) {
+ ParamAttrsWithIndex PAWI;
+ PAWI.index = 0;
+ PAWI.attrs = $8;
+ Attrs.push_back(PAWI);
+ }
// Check the arguments
ValueList Args;
if ($6->empty()) { // Has no arguments?
// Make sure no arguments is a good thing!
if (Ty->getNumParams() != 0)
GEN_ERROR("No arguments passed to a function that "
- "expects arguments!");
+ "expects arguments");
} else { // Has arguments?
// Loop through FunctionType's arguments and ensure they are specified
- // correctly!
- //
+ // correctly. Also, gather any parameter attributes.
FunctionType::param_iterator I = Ty->param_begin();
FunctionType::param_iterator E = Ty->param_end();
- ValueRefList::iterator ArgI = $6->begin(), ArgE = $6->end();
+ ParamList::iterator ArgI = $6->begin(), ArgE = $6->end();
+ unsigned index = 1;
- for (; ArgI != ArgE && I != E; ++ArgI, ++I) {
+ for (; ArgI != ArgE && I != E; ++ArgI, ++I, ++index) {
if (ArgI->Val->getType() != *I)
GEN_ERROR("Parameter " + ArgI->Val->getName()+ " is not of type '" +
- (*I)->getDescription() + "'!");
+ (*I)->getDescription() + "'");
Args.push_back(ArgI->Val);
+ if (ArgI->Attrs != ParamAttr::None) {
+ ParamAttrsWithIndex PAWI;
+ PAWI.index = index;
+ PAWI.attrs = ArgI->Attrs;
+ Attrs.push_back(PAWI);
+ }
}
if (Ty->isVarArg()) {
if (I == E)
for (; ArgI != ArgE; ++ArgI)
Args.push_back(ArgI->Val); // push the remaining varargs
} else if (I != E || ArgI != ArgE)
- GEN_ERROR("Invalid number of parameters detected!");
+ GEN_ERROR("Invalid number of parameters detected");
}
+
+ // Finish off the ParamAttrs and check them
+ const ParamAttrsList *PAL = 0;
+ if (!Attrs.empty())
+ PAL = ParamAttrsList::get(Attrs);
+
// Create the call node
- CallInst *CI = new CallInst(V, Args);
+ CallInst *CI = new CallInst(V, Args.begin(), Args.end());
CI->setTailCall($1);
CI->setCallingConv($2);
+ CI->setParamAttrs(PAL);
$$ = CI;
delete $6;
+ delete $3;
CHECK_FOR_ERROR
}
| MemoryInst {
delete $2;
CHECK_FOR_ERROR
}
- | MALLOC Types ',' INT32 ValueRef OptCAlign {
+ | MALLOC Types ',' INTTYPE ValueRef OptCAlign {
if (!UpRefs.empty())
GEN_ERROR("Invalid upreference in type: " + (*$2)->getDescription());
Value* tmpVal = getVal($4, $5);
delete $2;
CHECK_FOR_ERROR
}
- | ALLOCA Types ',' INT32 ValueRef OptCAlign {
+ | ALLOCA Types ',' INTTYPE ValueRef OptCAlign {
if (!UpRefs.empty())
GEN_ERROR("Invalid upreference in type: " + (*$2)->getDescription());
Value* tmpVal = getVal($4, $5);
| FREE ResolvedVal {
if (!isa<PointerType>($2->getType()))
GEN_ERROR("Trying to free nonpointer type " +
- $2->getType()->getDescription() + "!");
+ $2->getType()->getDescription() + "");
$$ = new FreeInst($2);
CHECK_FOR_ERROR
}
- | OptVolatile LOAD Types ValueRef {
+ | OptVolatile LOAD Types ValueRef OptCAlign {
if (!UpRefs.empty())
GEN_ERROR("Invalid upreference in type: " + (*$3)->getDescription());
if (!isa<PointerType>($3->get()))
(*$3)->getDescription());
Value* tmpVal = getVal(*$3, $4);
CHECK_FOR_ERROR
- $$ = new LoadInst(tmpVal, "", $1);
+ $$ = new LoadInst(tmpVal, "", $1, $5);
delete $3;
}
- | OptVolatile STORE ResolvedVal ',' Types ValueRef {
+ | OptVolatile STORE ResolvedVal ',' Types ValueRef OptCAlign {
if (!UpRefs.empty())
GEN_ERROR("Invalid upreference in type: " + (*$5)->getDescription());
const PointerType *PT = dyn_cast<PointerType>($5->get());
const Type *ElTy = PT->getElementType();
if (ElTy != $3->getType())
GEN_ERROR("Can't store '" + $3->getType()->getDescription() +
- "' into space of type '" + ElTy->getDescription() + "'!");
+ "' into space of type '" + ElTy->getDescription() + "'");
Value* tmpVal = getVal(*$5, $6);
CHECK_FOR_ERROR
- $$ = new StoreInst($3, tmpVal, $1);
+ $$ = new StoreInst($3, tmpVal, $1, $7);
delete $5;
}
| GETELEMENTPTR Types ValueRef IndexList {
if (!UpRefs.empty())
GEN_ERROR("Invalid upreference in type: " + (*$2)->getDescription());
if (!isa<PointerType>($2->get()))
- GEN_ERROR("getelementptr insn requires pointer operand!");
+ GEN_ERROR("getelementptr insn requires pointer operand");
- if (!GetElementPtrInst::getIndexedType(*$2, *$4, true))
+ if (!GetElementPtrInst::getIndexedType(*$2, $4->begin(), $4->end(), true))
GEN_ERROR("Invalid getelementptr indices for type '" +
- (*$2)->getDescription()+ "'!");
+ (*$2)->getDescription()+ "'");
Value* tmpVal = getVal(*$2, $3);
CHECK_FOR_ERROR
- $$ = new GetElementPtrInst(tmpVal, *$4);
+ $$ = new GetElementPtrInst(tmpVal, $4->begin(), $4->end());
delete $2;
delete $4;
};
// common code from the two 'RunVMAsmParser' functions
static Module* RunParser(Module * M) {
-
- llvmAsmlineno = 1; // Reset the current line number...
CurModule.CurrentModule = M;
-#if YYDEBUG
- yydebug = Debug;
-#endif
-
// Check to make sure the parser succeeded
if (yyparse()) {
if (ParserResult)
return 0;
}
+ // Emit an error if there are any unresolved types left.
+ if (!CurModule.LateResolveTypes.empty()) {
+ const ValID &DID = CurModule.LateResolveTypes.begin()->first;
+ if (DID.Type == ValID::LocalName) {
+ GenerateError("Undefined type remains at eof: '"+DID.getName() + "'");
+ } else {
+ GenerateError("Undefined type remains at eof: #" + itostr(DID.Num));
+ }
+ if (ParserResult)
+ delete ParserResult;
+ return 0;
+ }
+
+ // Emit an error if there are any unresolved values left.
+ if (!CurModule.LateResolveValues.empty()) {
+ Value *V = CurModule.LateResolveValues.back();
+ std::map<Value*, std::pair<ValID, int> >::iterator I =
+ CurModule.PlaceHolderInfo.find(V);
+
+ if (I != CurModule.PlaceHolderInfo.end()) {
+ ValID &DID = I->second.first;
+ if (DID.Type == ValID::LocalName) {
+ GenerateError("Undefined value remains at eof: "+DID.getName() + "'");
+ } else {
+ GenerateError("Undefined value remains at eof: #" + itostr(DID.Num));
+ }
+ if (ParserResult)
+ delete ParserResult;
+ return 0;
+ }
+ }
+
// Check to make sure that parsing produced a result
if (!ParserResult)
return 0;
}
void llvm::GenerateError(const std::string &message, int LineNo) {
- if (LineNo == -1) LineNo = llvmAsmlineno;
+ if (LineNo == -1) LineNo = LLLgetLineNo();
// TODO: column number in exception
if (TheParseError)
- TheParseError->setError(CurFilename, message, LineNo);
+ TheParseError->setError(LLLgetFilename(), message, LineNo);
TriggerError = 1;
}
int yyerror(const char *ErrorMsg) {
- std::string where
- = std::string((CurFilename == "-") ? std::string("<stdin>") : CurFilename)
- + ":" + utostr((unsigned) llvmAsmlineno) + ": ";
- std::string errMsg = std::string(ErrorMsg) + "\n" + where + " while reading ";
- if (yychar == YYEMPTY || yychar == 0)
- errMsg += "end-of-file.";
- else
- errMsg += "token: '" + std::string(llvmAsmtext, llvmAsmleng) + "'";
+ std::string where = LLLgetFilename() + ":" + utostr(LLLgetLineNo()) + ": ";
+ std::string errMsg = where + "error: " + std::string(ErrorMsg);
+ if (yychar != YYEMPTY && yychar != 0) {
+ errMsg += " while reading token: '";
+ errMsg += std::string(LLLgetTokenStart(),
+ LLLgetTokenStart()+LLLgetTokenLength()) + "'";
+ }
GenerateError(errMsg);
return 0;
}
projects / oota-llvm.git / blobdiff