diff options
author | Benjamin Kramer <benny.kra@googlemail.com> | 2014-03-29 19:21:20 +0000 |
---|---|---|
committer | Benjamin Kramer <benny.kra@googlemail.com> | 2014-03-29 19:21:20 +0000 |
commit | 190e0a1d6310f575c076e6062de221f12f05409f (patch) | |
tree | ac718638d5b2c2c794e3f4b35d5c37a74b62b404 /include | |
parent | 17576b2e165286dbc4e406c2dac93cc4ca8a823b (diff) | |
download | llvm-190e0a1d6310f575c076e6062de221f12f05409f.tar.gz llvm-190e0a1d6310f575c076e6062de221f12f05409f.tar.bz2 llvm-190e0a1d6310f575c076e6062de221f12f05409f.tar.xz |
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.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@205114 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include')
-rw-r--r-- | include/llvm/MC/MCLinkerOptimizationHint.h | 67 |
1 files changed, 24 insertions, 43 deletions
diff --git a/include/llvm/MC/MCLinkerOptimizationHint.h b/include/llvm/MC/MCLinkerOptimizationHint.h index eb37d158e4..52b46131ea 100644 --- a/include/llvm/MC/MCLinkerOptimizationHint.h +++ b/include/llvm/MC/MCLinkerOptimizationHint.h @@ -97,30 +97,30 @@ static inline int MCLOHIdToNbArgs(MCLOHType Kind) { } /// 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 |