<p dir="ltr">Should be done shortly after I get back from holiday. :)</p>
<div class="gmail_quote">On Aug 29, 2014 5:40 PM, "Jim Grosbach" <<a href="mailto:grosbach@apple.com">grosbach@apple.com</a>> wrote:<br type="attribution"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<troll>Penance for not re-killing the old JIT yet. ;) </troll><br>
<br>
> On Jun 15, 2014, at 12:55 PM, Eric Christopher <<a href="mailto:echristo@gmail.com">echristo@gmail.com</a>> wrote:<br>
><br>
> Author: echristo<br>
> Date: Sun Jun 15 14:55:14 2014<br>
> New Revision: 210996<br>
><br>
> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=210996&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=210996&view=rev</a><br>
> Log:<br>
> Temporarily revert r210953 in an attempt to bring the ARM buildbots<br>
> back.<br>
><br>
> Modified:<br>
> llvm/trunk/lib/Target/ARM/ARMCodeEmitter.cpp<br>
> llvm/trunk/lib/Target/ARM/ARMJITInfo.cpp<br>
> llvm/trunk/lib/Target/ARM/ARMJITInfo.h<br>
> llvm/trunk/lib/Target/ARM/ARMMachineFunctionInfo.cpp<br>
> llvm/trunk/lib/Target/ARM/ARMMachineFunctionInfo.h<br>
> llvm/trunk/lib/Target/ARM/ARMSubtarget.cpp<br>
> llvm/trunk/lib/Target/ARM/ARMSubtarget.h<br>
> llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp<br>
> llvm/trunk/lib/Target/ARM/ARMTargetMachine.h<br>
><br>
> Modified: llvm/trunk/lib/Target/ARM/ARMCodeEmitter.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMCodeEmitter.cpp?rev=210996&r1=210995&r2=210996&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMCodeEmitter.cpp?rev=210996&r1=210995&r2=210996&view=diff</a><br>
> ==============================================================================<br>
> --- llvm/trunk/lib/Target/ARM/ARMCodeEmitter.cpp (original)<br>
> +++ llvm/trunk/lib/Target/ARM/ARMCodeEmitter.cpp Sun Jun 15 14:55:14 2014<br>
> @@ -15,7 +15,6 @@<br>
> #include "ARM.h"<br>
> #include "ARMBaseInstrInfo.h"<br>
> #include "ARMConstantPoolValue.h"<br>
> -#include "ARMMachineFunctionInfo.h"<br>
> #include "ARMRelocations.h"<br>
> #include "ARMSubtarget.h"<br>
> #include "ARMTargetMachine.h"<br>
><br>
> Modified: llvm/trunk/lib/Target/ARM/ARMJITInfo.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMJITInfo.cpp?rev=210996&r1=210995&r2=210996&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMJITInfo.cpp?rev=210996&r1=210995&r2=210996&view=diff</a><br>
> ==============================================================================<br>
> --- llvm/trunk/lib/Target/ARM/ARMJITInfo.cpp (original)<br>
> +++ llvm/trunk/lib/Target/ARM/ARMJITInfo.cpp Sun Jun 15 14:55:14 2014<br>
> @@ -13,7 +13,6 @@<br>
><br>
> #include "ARMJITInfo.h"<br>
> #include "ARMConstantPoolValue.h"<br>
> -#include "ARMMachineFunctionInfo.h"<br>
> #include "ARMRelocations.h"<br>
> #include "MCTargetDesc/ARMBaseInfo.h"<br>
> #include "llvm/CodeGen/JITCodeEmitter.h"<br>
> @@ -335,10 +334,3 @@ void ARMJITInfo::relocate(void *Function<br>
> }<br>
> }<br>
> }<br>
> -<br>
> -void ARMJITInfo::Initialize(const MachineFunction &MF, bool isPIC) {<br>
> - const ARMFunctionInfo *AFI = MF.getInfo<ARMFunctionInfo>();<br>
> - ConstPoolId2AddrMap.resize(AFI->getNumPICLabels());<br>
> - JumpTableId2AddrMap.resize(AFI->getNumJumpTables());<br>
> - IsPIC = isPIC;<br>
> -}<br>
><br>
> Modified: llvm/trunk/lib/Target/ARM/ARMJITInfo.h<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMJITInfo.h?rev=210996&r1=210995&r2=210996&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMJITInfo.h?rev=210996&r1=210995&r2=210996&view=diff</a><br>
> ==============================================================================<br>
> --- llvm/trunk/lib/Target/ARM/ARMJITInfo.h (original)<br>
> +++ llvm/trunk/lib/Target/ARM/ARMJITInfo.h Sun Jun 15 14:55:14 2014<br>
> @@ -14,6 +14,7 @@<br>
> #ifndef ARMJITINFO_H<br>
> #define ARMJITINFO_H<br>
><br>
> +#include "ARMMachineFunctionInfo.h"<br>
> #include "llvm/ADT/DenseMap.h"<br>
> #include "llvm/ADT/SmallVector.h"<br>
> #include "llvm/CodeGen/MachineConstantPool.h"<br>
> @@ -102,7 +103,12 @@ namespace llvm {<br>
> /// Resize constant pool ids to CONSTPOOL_ENTRY addresses map; resize<br>
> /// jump table ids to jump table bases map; remember if codegen relocation<br>
> /// model is PIC.<br>
> - void Initialize(const MachineFunction &MF, bool isPIC);<br>
> + void Initialize(const MachineFunction &MF, bool isPIC) {<br>
> + const ARMFunctionInfo *AFI = MF.getInfo<ARMFunctionInfo>();<br>
> + ConstPoolId2AddrMap.resize(AFI->getNumPICLabels());<br>
> + JumpTableId2AddrMap.resize(AFI->getNumJumpTables());<br>
> + IsPIC = isPIC;<br>
> + }<br>
><br>
> /// getConstantPoolEntryAddr - The ARM target puts all constant<br>
> /// pool entries into constant islands. This returns the address of the<br>
><br>
> Modified: llvm/trunk/lib/Target/ARM/ARMMachineFunctionInfo.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMMachineFunctionInfo.cpp?rev=210996&r1=210995&r2=210996&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMMachineFunctionInfo.cpp?rev=210996&r1=210995&r2=210996&view=diff</a><br>
> ==============================================================================<br>
> --- llvm/trunk/lib/Target/ARM/ARMMachineFunctionInfo.cpp (original)<br>
> +++ llvm/trunk/lib/Target/ARM/ARMMachineFunctionInfo.cpp Sun Jun 15 14:55:14 2014<br>
> @@ -12,13 +12,3 @@<br>
> using namespace llvm;<br>
><br>
> void ARMFunctionInfo::anchor() { }<br>
> -<br>
> -ARMFunctionInfo::ARMFunctionInfo(MachineFunction &MF)<br>
> - : isThumb(MF.getTarget().getSubtarget<ARMSubtarget>().isThumb()),<br>
> - hasThumb2(MF.getTarget().getSubtarget<ARMSubtarget>().hasThumb2()),<br>
> - StByValParamsPadding(0), ArgRegsSaveSize(0), HasStackFrame(false),<br>
> - RestoreSPFromFP(false), LRSpilledForFarJump(false),<br>
> - FramePtrSpillOffset(0), GPRCS1Offset(0), GPRCS2Offset(0), DPRCSOffset(0),<br>
> - GPRCS1Size(0), GPRCS2Size(0), DPRCSSize(0), JumpTableUId(0),<br>
> - PICLabelUId(0), VarArgsFrameIndex(0), HasITBlocks(false),<br>
> - GlobalBaseReg(0) {}<br>
><br>
> Modified: llvm/trunk/lib/Target/ARM/ARMMachineFunctionInfo.h<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMMachineFunctionInfo.h?rev=210996&r1=210995&r2=210996&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMMachineFunctionInfo.h?rev=210996&r1=210995&r2=210996&view=diff</a><br>
> ==============================================================================<br>
> --- llvm/trunk/lib/Target/ARM/ARMMachineFunctionInfo.h (original)<br>
> +++ llvm/trunk/lib/Target/ARM/ARMMachineFunctionInfo.h Sun Jun 15 14:55:14 2014<br>
> @@ -130,7 +130,16 @@ public:<br>
> JumpTableUId(0), PICLabelUId(0),<br>
> VarArgsFrameIndex(0), HasITBlocks(false), GlobalBaseReg(0) {}<br>
><br>
> - explicit ARMFunctionInfo(MachineFunction &MF);<br>
> + explicit ARMFunctionInfo(MachineFunction &MF) :<br>
> + isThumb(MF.getTarget().getSubtarget<ARMSubtarget>().isThumb()),<br>
> + hasThumb2(MF.getTarget().getSubtarget<ARMSubtarget>().hasThumb2()),<br>
> + StByValParamsPadding(0),<br>
> + ArgRegsSaveSize(0), HasStackFrame(false), RestoreSPFromFP(false),<br>
> + LRSpilledForFarJump(false),<br>
> + FramePtrSpillOffset(0), GPRCS1Offset(0), GPRCS2Offset(0), DPRCSOffset(0),<br>
> + GPRCS1Size(0), GPRCS2Size(0), DPRCSSize(0),<br>
> + JumpTableUId(0), PICLabelUId(0),<br>
> + VarArgsFrameIndex(0), HasITBlocks(false), GlobalBaseReg(0) {}<br>
><br>
> bool isThumbFunction() const { return isThumb; }<br>
> bool isThumb1OnlyFunction() const { return isThumb && !hasThumb2; }<br>
><br>
> Modified: llvm/trunk/lib/Target/ARM/ARMSubtarget.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMSubtarget.cpp?rev=210996&r1=210995&r2=210996&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMSubtarget.cpp?rev=210996&r1=210995&r2=210996&view=diff</a><br>
> ==============================================================================<br>
> --- llvm/trunk/lib/Target/ARM/ARMSubtarget.cpp (original)<br>
> +++ llvm/trunk/lib/Target/ARM/ARMSubtarget.cpp Sun Jun 15 14:55:14 2014<br>
> @@ -148,7 +148,7 @@ ARMSubtarget::ARMSubtarget(const std::st<br>
> ARMProcClass(None), stackAlignment(4), CPUString(CPU), IsLittle(IsLittle),<br>
> TargetTriple(TT), Options(Options), TargetABI(ARM_ABI_UNKNOWN),<br>
> DL(computeDataLayout(initializeSubtargetDependencies(CPU, FS))),<br>
> - TSInfo(DL), JITInfo() {}<br>
> + TSInfo(DL) {}<br>
><br>
> void ARMSubtarget::initializeEnvironment() {<br>
> HasV4TOps = false;<br>
><br>
> Modified: llvm/trunk/lib/Target/ARM/ARMSubtarget.h<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMSubtarget.h?rev=210996&r1=210995&r2=210996&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMSubtarget.h?rev=210996&r1=210995&r2=210996&view=diff</a><br>
> ==============================================================================<br>
> --- llvm/trunk/lib/Target/ARM/ARMSubtarget.h (original)<br>
> +++ llvm/trunk/lib/Target/ARM/ARMSubtarget.h Sun Jun 15 14:55:14 2014<br>
> @@ -14,7 +14,6 @@<br>
> #ifndef ARMSUBTARGET_H<br>
> #define ARMSUBTARGET_H<br>
><br>
> -#include "ARMJITInfo.h"<br>
> #include "ARMSelectionDAGInfo.h"<br>
> #include "MCTargetDesc/ARMMCTargetDesc.h"<br>
> #include "llvm/ADT/Triple.h"<br>
> @@ -257,12 +256,10 @@ protected:<br>
><br>
> const DataLayout *getDataLayout() const { return &DL; }<br>
> const ARMSelectionDAGInfo *getSelectionDAGInfo() const { return &TSInfo; }<br>
> - ARMJITInfo *getJITInfo() { return &JITInfo; }<br>
><br>
> private:<br>
> const DataLayout DL;<br>
> ARMSelectionDAGInfo TSInfo;<br>
> - ARMJITInfo JITInfo;<br>
><br>
> void initializeEnvironment();<br>
> void resetSubtargetFeatures(StringRef CPU, StringRef FS);<br>
><br>
> Modified: llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp?rev=210996&r1=210995&r2=210996&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp?rev=210996&r1=210995&r2=210996&view=diff</a><br>
> ==============================================================================<br>
> --- llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp (original)<br>
> +++ llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp Sun Jun 15 14:55:14 2014<br>
> @@ -52,7 +52,7 @@ ARMBaseTargetMachine::ARMBaseTargetMachi<br>
> CodeGenOpt::Level OL,<br>
> bool isLittle)<br>
> : LLVMTargetMachine(T, TT, CPU, FS, Options, RM, CM, OL),<br>
> - Subtarget(TT, CPU, FS, isLittle, Options) {<br>
> + Subtarget(TT, CPU, FS, isLittle, Options), JITInfo() {<br>
><br>
> // Default to triple-appropriate float ABI<br>
> if (Options.FloatABIType == FloatABI::Default)<br>
><br>
> Modified: llvm/trunk/lib/Target/ARM/ARMTargetMachine.h<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMTargetMachine.h?rev=210996&r1=210995&r2=210996&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMTargetMachine.h?rev=210996&r1=210995&r2=210996&view=diff</a><br>
> ==============================================================================<br>
> --- llvm/trunk/lib/Target/ARM/ARMTargetMachine.h (original)<br>
> +++ llvm/trunk/lib/Target/ARM/ARMTargetMachine.h Sun Jun 15 14:55:14 2014<br>
> @@ -32,6 +32,10 @@ namespace llvm {<br>
> class ARMBaseTargetMachine : public LLVMTargetMachine {<br>
> protected:<br>
> ARMSubtarget Subtarget;<br>
> +<br>
> +private:<br>
> + ARMJITInfo JITInfo;<br>
> +<br>
> public:<br>
> ARMBaseTargetMachine(const Target &T, StringRef TT,<br>
> StringRef CPU, StringRef FS,<br>
> @@ -40,6 +44,7 @@ public:<br>
> CodeGenOpt::Level OL,<br>
> bool isLittle);<br>
><br>
> + ARMJITInfo *getJITInfo() override { return &JITInfo; }<br>
> const ARMSubtarget *getSubtargetImpl() const override { return &Subtarget; }<br>
> const ARMTargetLowering *getTargetLowering() const override {<br>
> // Implemented by derived classes<br>
><br>
><br>
> _______________________________________________<br>
> llvm-commits mailing list<br>
> <a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
> <a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
<br>
</blockquote></div>