mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2025-07-25 13:24:46 +00:00
IR: Split Metadata from Value
Split `Metadata` away from the `Value` class hierarchy, as part of PR21532. Assembly and bitcode changes are in the wings, but this is the bulk of the change for the IR C++ API. I have a follow-up patch prepared for `clang`. If this breaks other sub-projects, I apologize in advance :(. Help me compile it on Darwin I'll try to fix it. FWIW, the errors should be easy to fix, so it may be simpler to just fix it yourself. This breaks the build for all metadata-related code that's out-of-tree. Rest assured the transition is mechanical and the compiler should catch almost all of the problems. Here's a quick guide for updating your code: - `Metadata` is the root of a class hierarchy with three main classes: `MDNode`, `MDString`, and `ValueAsMetadata`. It is distinct from the `Value` class hierarchy. It is typeless -- i.e., instances do *not* have a `Type`. - `MDNode`'s operands are all `Metadata *` (instead of `Value *`). - `TrackingVH<MDNode>` and `WeakVH` referring to metadata can be replaced with `TrackingMDNodeRef` and `TrackingMDRef`, respectively. If you're referring solely to resolved `MDNode`s -- post graph construction -- just use `MDNode*`. - `MDNode` (and the rest of `Metadata`) have only limited support for `replaceAllUsesWith()`. As long as an `MDNode` is pointing at a forward declaration -- the result of `MDNode::getTemporary()` -- it maintains a side map of its uses and can RAUW itself. Once the forward declarations are fully resolved RAUW support is dropped on the ground. This means that uniquing collisions on changing operands cause nodes to become "distinct". (This already happened fairly commonly, whenever an operand went to null.) If you're constructing complex (non self-reference) `MDNode` cycles, you need to call `MDNode::resolveCycles()` on each node (or on a top-level node that somehow references all of the nodes). Also, don't do that. Metadata cycles (and the RAUW machinery needed to construct them) are expensive. - An `MDNode` can only refer to a `Constant` through a bridge called `ConstantAsMetadata` (one of the subclasses of `ValueAsMetadata`). As a side effect, accessing an operand of an `MDNode` that is known to be, e.g., `ConstantInt`, takes three steps: first, cast from `Metadata` to `ConstantAsMetadata`; second, extract the `Constant`; third, cast down to `ConstantInt`. The eventual goal is to introduce `MDInt`/`MDFloat`/etc. and have metadata schema owners transition away from using `Constant`s when the type isn't important (and they don't care about referring to `GlobalValue`s). In the meantime, I've added transitional API to the `mdconst` namespace that matches semantics with the old code, in order to avoid adding the error-prone three-step equivalent to every call site. If your old code was: MDNode *N = foo(); bar(isa <ConstantInt>(N->getOperand(0))); baz(cast <ConstantInt>(N->getOperand(1))); bak(cast_or_null <ConstantInt>(N->getOperand(2))); bat(dyn_cast <ConstantInt>(N->getOperand(3))); bay(dyn_cast_or_null<ConstantInt>(N->getOperand(4))); you can trivially match its semantics with: MDNode *N = foo(); bar(mdconst::hasa <ConstantInt>(N->getOperand(0))); baz(mdconst::extract <ConstantInt>(N->getOperand(1))); bak(mdconst::extract_or_null <ConstantInt>(N->getOperand(2))); bat(mdconst::dyn_extract <ConstantInt>(N->getOperand(3))); bay(mdconst::dyn_extract_or_null<ConstantInt>(N->getOperand(4))); and when you transition your metadata schema to `MDInt`: MDNode *N = foo(); bar(isa <MDInt>(N->getOperand(0))); baz(cast <MDInt>(N->getOperand(1))); bak(cast_or_null <MDInt>(N->getOperand(2))); bat(dyn_cast <MDInt>(N->getOperand(3))); bay(dyn_cast_or_null<MDInt>(N->getOperand(4))); - A `CallInst` -- specifically, intrinsic instructions -- can refer to metadata through a bridge called `MetadataAsValue`. This is a subclass of `Value` where `getType()->isMetadataTy()`. `MetadataAsValue` is the *only* class that can legally refer to a `LocalAsMetadata`, which is a bridged form of non-`Constant` values like `Argument` and `Instruction`. It can also refer to any other `Metadata` subclass. (I'll break all your testcases in a follow-up commit, when I propagate this change to assembly.) git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@223802 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
124
lib/IR/Core.cpp
124
lib/IR/Core.cpp
@@ -556,12 +556,17 @@ int LLVMHasMetadata(LLVMValueRef Inst) {
|
||||
}
|
||||
|
||||
LLVMValueRef LLVMGetMetadata(LLVMValueRef Inst, unsigned KindID) {
|
||||
return wrap(unwrap<Instruction>(Inst)->getMetadata(KindID));
|
||||
auto *I = unwrap<Instruction>(Inst);
|
||||
assert(I && "Expected instruction");
|
||||
if (auto *MD = I->getMetadata(KindID))
|
||||
return wrap(MetadataAsValue::get(I->getContext(), MD));
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
void LLVMSetMetadata(LLVMValueRef Inst, unsigned KindID, LLVMValueRef MD) {
|
||||
unwrap<Instruction>(Inst)
|
||||
->setMetadata(KindID, MD ? unwrap<MDNode>(MD) : nullptr);
|
||||
MDNode *N =
|
||||
MD ? cast<MDNode>(unwrap<MetadataAsValue>(MD)->getMetadata()) : nullptr;
|
||||
unwrap<Instruction>(Inst)->setMetadata(KindID, N);
|
||||
}
|
||||
|
||||
/*--.. Conversion functions ................................................--*/
|
||||
@@ -573,6 +578,21 @@ void LLVMSetMetadata(LLVMValueRef Inst, unsigned KindID, LLVMValueRef MD) {
|
||||
|
||||
LLVM_FOR_EACH_VALUE_SUBCLASS(LLVM_DEFINE_VALUE_CAST)
|
||||
|
||||
LLVMValueRef LLVMIsAMDNode(LLVMValueRef Val) {
|
||||
if (auto *MD = dyn_cast_or_null<MetadataAsValue>(unwrap(Val)))
|
||||
if (isa<MDNode>(MD->getMetadata()) ||
|
||||
isa<ValueAsMetadata>(MD->getMetadata()))
|
||||
return Val;
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
LLVMValueRef LLVMIsAMDString(LLVMValueRef Val) {
|
||||
if (auto *MD = dyn_cast_or_null<MetadataAsValue>(unwrap(Val)))
|
||||
if (isa<MDString>(MD->getMetadata()))
|
||||
return Val;
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
/*--.. Operations on Uses ..................................................--*/
|
||||
LLVMUseRef LLVMGetFirstUse(LLVMValueRef Val) {
|
||||
Value *V = unwrap(Val);
|
||||
@@ -598,10 +618,28 @@ LLVMValueRef LLVMGetUsedValue(LLVMUseRef U) {
|
||||
}
|
||||
|
||||
/*--.. Operations on Users .................................................--*/
|
||||
|
||||
static LLVMValueRef getMDNodeOperandImpl(LLVMContext &Context, const MDNode *N,
|
||||
unsigned Index) {
|
||||
Metadata *Op = N->getOperand(Index);
|
||||
if (!Op)
|
||||
return nullptr;
|
||||
if (auto *C = dyn_cast<ConstantAsMetadata>(Op))
|
||||
return wrap(C->getValue());
|
||||
return wrap(MetadataAsValue::get(Context, Op));
|
||||
}
|
||||
|
||||
LLVMValueRef LLVMGetOperand(LLVMValueRef Val, unsigned Index) {
|
||||
Value *V = unwrap(Val);
|
||||
if (MDNode *MD = dyn_cast<MDNode>(V))
|
||||
return wrap(MD->getOperand(Index));
|
||||
if (auto *MD = dyn_cast<MetadataAsValue>(V)) {
|
||||
if (auto *L = dyn_cast<ValueAsMetadata>(MD->getMetadata())) {
|
||||
assert(Index == 0 && "Function-local metadata can only have one operand");
|
||||
return wrap(L->getValue());
|
||||
}
|
||||
return getMDNodeOperandImpl(V->getContext(),
|
||||
cast<MDNode>(MD->getMetadata()), Index);
|
||||
}
|
||||
|
||||
return wrap(cast<User>(V)->getOperand(Index));
|
||||
}
|
||||
|
||||
@@ -616,8 +654,9 @@ void LLVMSetOperand(LLVMValueRef Val, unsigned Index, LLVMValueRef Op) {
|
||||
|
||||
int LLVMGetNumOperands(LLVMValueRef Val) {
|
||||
Value *V = unwrap(Val);
|
||||
if (MDNode *MD = dyn_cast<MDNode>(V))
|
||||
return MD->getNumOperands();
|
||||
if (isa<MetadataAsValue>(V))
|
||||
return LLVMGetMDNodeNumOperands(Val);
|
||||
|
||||
return cast<User>(V)->getNumOperands();
|
||||
}
|
||||
|
||||
@@ -658,7 +697,9 @@ LLVMValueRef LLVMConstPointerNull(LLVMTypeRef Ty) {
|
||||
|
||||
LLVMValueRef LLVMMDStringInContext(LLVMContextRef C, const char *Str,
|
||||
unsigned SLen) {
|
||||
return wrap(MDString::get(*unwrap(C), StringRef(Str, SLen)));
|
||||
LLVMContext &Context = *unwrap(C);
|
||||
return wrap(MetadataAsValue::get(
|
||||
Context, MDString::get(Context, StringRef(Str, SLen))));
|
||||
}
|
||||
|
||||
LLVMValueRef LLVMMDString(const char *Str, unsigned SLen) {
|
||||
@@ -667,8 +708,29 @@ LLVMValueRef LLVMMDString(const char *Str, unsigned SLen) {
|
||||
|
||||
LLVMValueRef LLVMMDNodeInContext(LLVMContextRef C, LLVMValueRef *Vals,
|
||||
unsigned Count) {
|
||||
return wrap(MDNode::get(*unwrap(C),
|
||||
makeArrayRef(unwrap<Value>(Vals, Count), Count)));
|
||||
LLVMContext &Context = *unwrap(C);
|
||||
SmallVector<Metadata *, 8> MDs;
|
||||
for (auto *OV : makeArrayRef(Vals, Count)) {
|
||||
Value *V = unwrap(OV);
|
||||
Metadata *MD;
|
||||
if (!V)
|
||||
MD = nullptr;
|
||||
else if (auto *C = dyn_cast<Constant>(V))
|
||||
MD = ConstantAsMetadata::get(C);
|
||||
else if (auto *MDV = dyn_cast<MetadataAsValue>(V)) {
|
||||
MD = MDV->getMetadata();
|
||||
assert(!isa<LocalAsMetadata>(MD) && "Unexpected function-local metadata "
|
||||
"outside of direct argument to call");
|
||||
} else {
|
||||
// This is function-local metadata. Pretend to make an MDNode.
|
||||
assert(Count == 1 &&
|
||||
"Expected only one operand to function-local metadata");
|
||||
return wrap(MetadataAsValue::get(Context, LocalAsMetadata::get(V)));
|
||||
}
|
||||
|
||||
MDs.push_back(MD);
|
||||
}
|
||||
return wrap(MetadataAsValue::get(Context, MDNode::get(Context, MDs)));
|
||||
}
|
||||
|
||||
LLVMValueRef LLVMMDNode(LLVMValueRef *Vals, unsigned Count) {
|
||||
@@ -676,25 +738,35 @@ LLVMValueRef LLVMMDNode(LLVMValueRef *Vals, unsigned Count) {
|
||||
}
|
||||
|
||||
const char *LLVMGetMDString(LLVMValueRef V, unsigned* Len) {
|
||||
if (const MDString *S = dyn_cast<MDString>(unwrap(V))) {
|
||||
*Len = S->getString().size();
|
||||
return S->getString().data();
|
||||
}
|
||||
if (const auto *MD = dyn_cast<MetadataAsValue>(unwrap(V)))
|
||||
if (const MDString *S = dyn_cast<MDString>(MD->getMetadata())) {
|
||||
*Len = S->getString().size();
|
||||
return S->getString().data();
|
||||
}
|
||||
*Len = 0;
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
unsigned LLVMGetMDNodeNumOperands(LLVMValueRef V)
|
||||
{
|
||||
return cast<MDNode>(unwrap(V))->getNumOperands();
|
||||
auto *MD = cast<MetadataAsValue>(unwrap(V));
|
||||
if (isa<ValueAsMetadata>(MD->getMetadata()))
|
||||
return 1;
|
||||
return cast<MDNode>(MD->getMetadata())->getNumOperands();
|
||||
}
|
||||
|
||||
void LLVMGetMDNodeOperands(LLVMValueRef V, LLVMValueRef *Dest)
|
||||
{
|
||||
const MDNode *N = cast<MDNode>(unwrap(V));
|
||||
auto *MD = cast<MetadataAsValue>(unwrap(V));
|
||||
if (auto *MDV = dyn_cast<ValueAsMetadata>(MD->getMetadata())) {
|
||||
*Dest = wrap(MDV->getValue());
|
||||
return;
|
||||
}
|
||||
const auto *N = cast<MDNode>(MD->getMetadata());
|
||||
const unsigned numOperands = N->getNumOperands();
|
||||
LLVMContext &Context = unwrap(V)->getContext();
|
||||
for (unsigned i = 0; i < numOperands; i++)
|
||||
Dest[i] = wrap(N->getOperand(i));
|
||||
Dest[i] = getMDNodeOperandImpl(Context, N, i);
|
||||
}
|
||||
|
||||
unsigned LLVMGetNamedMetadataNumOperands(LLVMModuleRef M, const char* name)
|
||||
@@ -710,8 +782,9 @@ void LLVMGetNamedMetadataOperands(LLVMModuleRef M, const char* name, LLVMValueRe
|
||||
NamedMDNode *N = unwrap(M)->getNamedMetadata(name);
|
||||
if (!N)
|
||||
return;
|
||||
LLVMContext &Context = unwrap(M)->getContext();
|
||||
for (unsigned i=0;i<N->getNumOperands();i++)
|
||||
Dest[i] = wrap(N->getOperand(i));
|
||||
Dest[i] = wrap(MetadataAsValue::get(Context, N->getOperand(i)));
|
||||
}
|
||||
|
||||
void LLVMAddNamedMetadataOperand(LLVMModuleRef M, const char* name,
|
||||
@@ -720,9 +793,9 @@ void LLVMAddNamedMetadataOperand(LLVMModuleRef M, const char* name,
|
||||
NamedMDNode *N = unwrap(M)->getOrInsertNamedMetadata(name);
|
||||
if (!N)
|
||||
return;
|
||||
MDNode *Op = Val ? unwrap<MDNode>(Val) : nullptr;
|
||||
if (Op)
|
||||
N->addOperand(Op);
|
||||
if (!Val)
|
||||
return;
|
||||
N->addOperand(cast<MDNode>(unwrap<MetadataAsValue>(Val)->getMetadata()));
|
||||
}
|
||||
|
||||
/*--.. Operations on scalar constants ......................................--*/
|
||||
@@ -2092,13 +2165,16 @@ void LLVMDisposeBuilder(LLVMBuilderRef Builder) {
|
||||
/*--.. Metadata builders ...................................................--*/
|
||||
|
||||
void LLVMSetCurrentDebugLocation(LLVMBuilderRef Builder, LLVMValueRef L) {
|
||||
MDNode *Loc = L ? unwrap<MDNode>(L) : nullptr;
|
||||
MDNode *Loc =
|
||||
L ? cast<MDNode>(unwrap<MetadataAsValue>(L)->getMetadata()) : nullptr;
|
||||
unwrap(Builder)->SetCurrentDebugLocation(DebugLoc::getFromDILocation(Loc));
|
||||
}
|
||||
|
||||
LLVMValueRef LLVMGetCurrentDebugLocation(LLVMBuilderRef Builder) {
|
||||
return wrap(unwrap(Builder)->getCurrentDebugLocation()
|
||||
.getAsMDNode(unwrap(Builder)->getContext()));
|
||||
LLVMContext &Context = unwrap(Builder)->getContext();
|
||||
return wrap(MetadataAsValue::get(
|
||||
Context,
|
||||
unwrap(Builder)->getCurrentDebugLocation().getAsMDNode(Context)));
|
||||
}
|
||||
|
||||
void LLVMSetInstDebugLocation(LLVMBuilderRef Builder, LLVMValueRef Inst) {
|
||||
|
Reference in New Issue
Block a user