Skip to content

Fixed a small arm bug #2

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 1 commit into from
Aug 10, 2012
Merged

Fixed a small arm bug #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions lib/Target/ARM/ARMFastISel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,9 @@ class ARMFastISel : public FastISel {
LLVMContext *Context;

public:
explicit ARMFastISel(FunctionLoweringInfo &funcInfo)
: FastISel(funcInfo),
explicit ARMFastISel(FunctionLoweringInfo &funcInfo,
GCFunctionInfo &gcInfo)
: FastISel(funcInfo, gcInfo),
TM(funcInfo.MF->getTarget()),
TII(*TM.getInstrInfo()),
TLI(*TM.getTargetLowering()) {
Expand Down Expand Up @@ -2720,14 +2721,15 @@ bool ARMFastISel::TryToFoldLoad(MachineInstr *MI, unsigned OpNo,
}

namespace llvm {
FastISel *ARM::createFastISel(FunctionLoweringInfo &funcInfo) {
FastISel *ARM::createFastISel(FunctionLoweringInfo &funcInfo,
GCFunctionInfo &gcInfo) {
// Completely untested on non-iOS.
const TargetMachine &TM = funcInfo.MF->getTarget();

// Darwin and thumb1 only for now.
const ARMSubtarget *Subtarget = &TM.getSubtarget<ARMSubtarget>();
if (Subtarget->isTargetIOS() && !Subtarget->isThumb1Only())
return new ARMFastISel(funcInfo);
return new ARMFastISel(funcInfo, gcInfo);
return 0;
}
}
5 changes: 3 additions & 2 deletions lib/Target/ARM/ARMISelLowering.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1041,8 +1041,9 @@ const TargetRegisterClass *ARMTargetLowering::getRegClassFor(EVT VT) const {

// Create a fast isel object.
FastISel *
ARMTargetLowering::createFastISel(FunctionLoweringInfo &funcInfo) const {
return ARM::createFastISel(funcInfo);
ARMTargetLowering::createFastISel(FunctionLoweringInfo &funcInfo,
GCFunctionInfo &gcInfo) const {
return ARM::createFastISel(funcInfo, gcInfo);
}

/// getMaximalGlobalOffset - Returns the maximal possible offset which can
Expand Down
6 changes: 4 additions & 2 deletions lib/Target/ARM/ARMISelLowering.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,8 @@ namespace llvm {

/// createFastISel - This method returns a target specific FastISel object,
/// or null if the target does not support "fast" ISel.
virtual FastISel *createFastISel(FunctionLoweringInfo &funcInfo) const;
virtual FastISel *createFastISel(FunctionLoweringInfo &funcInfo,
GCFunctionInfo &gcInfo) const;

Sched::Preference getSchedulingPreference(SDNode *N) const;

Expand Down Expand Up @@ -544,7 +545,8 @@ namespace llvm {


namespace ARM {
FastISel *createFastISel(FunctionLoweringInfo &funcInfo);
FastISel *createFastISel(FunctionLoweringInfo &funcInfo,
GCFunctionInfo &gcInfo);
}
}

Expand Down