[llvm] r205114 - Detemplatize LOHDirective.
Benjamin Kramer
benny.kra at googlemail.com
Sat Mar 29 12:21:21 PDT 2014
Author: d0k
Date: Sat Mar 29 14:21:20 2014
New Revision: 205114
URL: http://llvm.org/viewvc/llvm-project?rev=205114&view=rev
Log:
Detemplatize LOHDirective.
The ARM64 backend uses it only as a container to keep an MCLOHType and
Arguments around so give it its own little copy. The other functionality
isn't used and we had a crazy method specialization hack in place to
keep it working. Unfortunately that was incompatible with MSVC.
Also range-ify a couple of loops while at it.
Modified:
llvm/trunk/include/llvm/MC/MCLinkerOptimizationHint.h
llvm/trunk/lib/MC/MCLinkerOptimizationHint.cpp
llvm/trunk/lib/Target/ARM64/ARM64AsmPrinter.cpp
llvm/trunk/lib/Target/ARM64/ARM64MachineFunctionInfo.h
Modified: llvm/trunk/include/llvm/MC/MCLinkerOptimizationHint.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/MCLinkerOptimizationHint.h?rev=205114&r1=205113&r2=205114&view=diff
==============================================================================
--- llvm/trunk/include/llvm/MC/MCLinkerOptimizationHint.h (original)
+++ llvm/trunk/include/llvm/MC/MCLinkerOptimizationHint.h Sat Mar 29 14:21:20 2014
@@ -97,30 +97,30 @@ static inline int MCLOHIdToNbArgs(MCLOHT
}
/// Store Linker Optimization Hint information (LOH).
-template<typename T>
-class LOHDirective {
-private:
+class MCLOHDirective {
MCLOHType Kind;
/// Arguments of this directive. Order matters.
- SmallVector<T *, 3> Args;
+ SmallVector<MCSymbol *, 3> Args;
/// Emit this directive in @p OutStream using the information available
/// in the given @p ObjWriter and @p Layout to get the address of the
/// arguments within the object file.
/// This function is currently specialized for T = MCSymbol.
void Emit_impl(raw_ostream &OutStream, const MachObjectWriter &ObjWriter,
- const MCAsmLayout &Layout) const { }
+ const MCAsmLayout &Layout) const;
public:
- typedef SmallVectorImpl<T *> LOHArgs;
+ typedef SmallVectorImpl<MCSymbol *> LOHArgs;
- LOHDirective(MCLOHType Kind, const LOHArgs &Args)
- : Kind(Kind), Args(Args.begin(), Args.end()) {};
+ MCLOHDirective(MCLOHType Kind, const LOHArgs &Args)
+ : Kind(Kind), Args(Args.begin(), Args.end()) {
+ assert(isValidMCLOHType(Kind) && "Invalid LOH directive type!");
+ }
MCLOHType getKind() const { return Kind; }
- const LOHArgs & getArgs() const { return Args; }
+ const LOHArgs &getArgs() const { return Args; }
/// Emit this directive as:
/// <kind, numArgs, addr1, ..., addrN>
@@ -140,44 +140,35 @@ public:
}
};
-template<typename T>
-class LOHContainer {
-public:
- typedef SmallVectorImpl<LOHDirective<T> > LOHDirectives;
-
-private:
+class MCLOHContainer {
/// Keep track of the emit size of all the LOHs.
mutable uint64_t EmitSize;
/// Keep track of all LOH directives.
- SmallVector<LOHDirective<T>, 32> Directives;
-
- /// Accessor to the directives.
- LOHDirectives &getDirectives() { return Directives; }
+ SmallVector<MCLOHDirective, 32> Directives;
public:
- LOHContainer() : EmitSize(0) {};
+ typedef SmallVectorImpl<MCLOHDirective> LOHDirectives;
+
+ MCLOHContainer() : EmitSize(0) {};
/// Const accessor to the directives.
const LOHDirectives &getDirectives() const {
- return const_cast<LOHContainer *>(this)->getDirectives();
+ return Directives;
}
/// Add the directive of the given kind @p Kind with the given arguments
/// @p Args to the container.
- void addDirective(MCLOHType Kind,
- const typename LOHDirective<T>::LOHArgs &Args) {
- assert(isValidMCLOHType(Kind) && "Invalid LOH directive type!");
- getDirectives().push_back(LOHDirective<T>(Kind, Args));
+ void addDirective(MCLOHType Kind, const MCLOHDirective::LOHArgs &Args) {
+ Directives.push_back(MCLOHDirective(Kind, Args));
}
/// Get the size of the directives if emitted.
uint64_t getEmitSize(const MachObjectWriter &ObjWriter,
const MCAsmLayout &Layout) const {
if (!EmitSize) {
- for (typename LOHDirectives::const_iterator It = getDirectives().begin(),
- EndIt = getDirectives().end(); It != EndIt; ++It)
- EmitSize += It->getEmitSize(ObjWriter, Layout);
+ for (const MCLOHDirective &D : Directives)
+ EmitSize += D.getEmitSize(ObjWriter, Layout);
}
return EmitSize;
}
@@ -185,30 +176,20 @@ public:
/// Emit all Linker Optimization Hint in one big table.
/// Each line of the table is emitted by LOHDirective::Emit.
void Emit(MachObjectWriter &ObjWriter, const MCAsmLayout &Layout) const {
- for (typename LOHDirectives::const_iterator It = getDirectives().begin(),
- EndIt = getDirectives().end(); It != EndIt; ++It)
- It->Emit(ObjWriter, Layout);
+ for (const MCLOHDirective &D : Directives)
+ D.Emit(ObjWriter, Layout);
}
void reset() {
- getDirectives().clear();
+ Directives.clear();
EmitSize = 0;
}
};
// Add types for specialized template using MCSymbol.
-typedef LOHDirective<MCSymbol> MCLOHDirective;
-typedef LOHDirective<MCSymbol>::LOHArgs MCLOHArgs;
-
-typedef LOHContainer<MCLOHDirective>::LOHDirectives MCLOHDirectives;
-
-typedef LOHContainer<MCSymbol> MCLOHContainer;
+typedef MCLOHDirective::LOHArgs MCLOHArgs;
+typedef MCLOHContainer::LOHDirectives MCLOHDirectives;
-// Declare the specialization for MCSymbol.
-template<>
-void MCLOHDirective::Emit_impl(raw_ostream &OutStream,
- const MachObjectWriter &ObjWriter,
- const MCAsmLayout &Layout) const;
} // end namespace llvm
#endif
Modified: llvm/trunk/lib/MC/MCLinkerOptimizationHint.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCLinkerOptimizationHint.cpp?rev=205114&r1=205113&r2=205114&view=diff
==============================================================================
--- llvm/trunk/lib/MC/MCLinkerOptimizationHint.cpp (original)
+++ llvm/trunk/lib/MC/MCLinkerOptimizationHint.cpp Sat Mar 29 14:21:20 2014
@@ -14,8 +14,6 @@
using namespace llvm;
-namespace llvm {
-template<>
void MCLOHDirective::Emit_impl(raw_ostream &OutStream,
const MachObjectWriter &ObjWriter,
const MCAsmLayout &Layout) const {
@@ -27,4 +25,3 @@ void MCLOHDirective::Emit_impl(raw_ostre
encodeULEB128(ObjWriter.getSymbolAddress(&Asm.getSymbolData(**It), Layout),
OutStream);
}
-} // end namespace llvm
Modified: llvm/trunk/lib/Target/ARM64/ARM64AsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM64/ARM64AsmPrinter.cpp?rev=205114&r1=205113&r2=205114&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM64/ARM64AsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/ARM64/ARM64AsmPrinter.cpp Sat Mar 29 14:21:20 2014
@@ -135,26 +135,16 @@ ARM64AsmPrinter::getDebugValueLocation(c
}
void ARM64AsmPrinter::EmitLOHs() {
- const ARM64FunctionInfo::MILOHDirectives &LOHs =
- const_cast<const ARM64FunctionInfo *>(ARM64FI)
- ->getLOHContainer()
- .getDirectives();
SmallVector<MCSymbol *, 3> MCArgs;
- for (ARM64FunctionInfo::MILOHDirectives::const_iterator It = LOHs.begin(),
- EndIt = LOHs.end();
- It != EndIt; ++It) {
- const ARM64FunctionInfo::MILOHArgs &MIArgs = It->getArgs();
- for (ARM64FunctionInfo::MILOHArgs::const_iterator
- MIArgsIt = MIArgs.begin(),
- EndMIArgsIt = MIArgs.end();
- MIArgsIt != EndMIArgsIt; ++MIArgsIt) {
- MInstToMCSymbol::iterator LabelIt = LOHInstToLabel.find(*MIArgsIt);
+ for (const auto &D : ARM64FI->getLOHContainer()) {
+ for (const MachineInstr *MI : D.getArgs()) {
+ MInstToMCSymbol::iterator LabelIt = LOHInstToLabel.find(MI);
assert(LabelIt != LOHInstToLabel.end() &&
"Label hasn't been inserted for LOH related instruction");
MCArgs.push_back(LabelIt->second);
}
- OutStreamer.EmitLOHDirective(It->getKind(), MCArgs);
+ OutStreamer.EmitLOHDirective(D.getKind(), MCArgs);
MCArgs.clear();
}
}
Modified: llvm/trunk/lib/Target/ARM64/ARM64MachineFunctionInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM64/ARM64MachineFunctionInfo.h?rev=205114&r1=205113&r2=205114&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM64/ARM64MachineFunctionInfo.h (original)
+++ llvm/trunk/lib/Target/ARM64/ARM64MachineFunctionInfo.h Sat Mar 29 14:21:20 2014
@@ -100,20 +100,33 @@ public:
const SetOfInstructions &getLOHRelated() const { return LOHRelated; }
// Shortcuts for LOH related types.
- typedef LOHDirective<const MachineInstr> MILOHDirective;
- typedef MILOHDirective::LOHArgs MILOHArgs;
+ class MILOHDirective {
+ MCLOHType Kind;
+
+ /// Arguments of this directive. Order matters.
+ SmallVector<const MachineInstr *, 3> Args;
+
+ public:
+ typedef SmallVectorImpl<const MachineInstr *> LOHArgs;
- typedef LOHContainer<const MachineInstr> MILOHContainer;
- typedef MILOHContainer::LOHDirectives MILOHDirectives;
+ MILOHDirective(MCLOHType Kind, const LOHArgs &Args)
+ : Kind(Kind), Args(Args.begin(), Args.end()) {
+ assert(isValidMCLOHType(Kind) && "Invalid LOH directive type!");
+ }
+
+ MCLOHType getKind() const { return Kind; }
+ const LOHArgs &getArgs() const { return Args; }
+ };
+
+ typedef MILOHDirective::LOHArgs MILOHArgs;
+ typedef SmallVector<MILOHDirective, 32> MILOHContainer;
const MILOHContainer &getLOHContainer() const { return LOHContainerSet; }
/// Add a LOH directive of this @p Kind and this @p Args.
void addLOHDirective(MCLOHType Kind, const MILOHArgs &Args) {
- LOHContainerSet.addDirective(Kind, Args);
- for (MILOHArgs::const_iterator It = Args.begin(), EndIt = Args.end();
- It != EndIt; ++It)
- LOHRelated.insert(*It);
+ LOHContainerSet.push_back(MILOHDirective(Kind, Args));
+ LOHRelated.insert(Args.begin(), Args.end());
}
private:
More information about the llvm-commits
mailing list