[llvm] r181706 - Remove unused fields and arguments.

[Tom Stellard]

Hi Bill,

I'm sorry I missed this email, but when I asked for r182113 to be
cherry-picked to the 3.3 branch, I was assuming this commit would not be included in
the 3.3 branch.  As a result r182113 has broken the 3.3 build for R600.

Please also cherry-pick r182112 to the 3.3 branch, this will fix the build.

Thanks,
Tom

On Fri, May 17, 2013 at 11:50:32AM -0700, Bill Wendling wrote:
> Okay. Done.
> 
> -bw
> 
> 
> 
> On Thu, May 16, 2013 at 7:07 PM, NAKAMURA Takumi <geek4civic at gmail.com>wrote:
> 
> > Bill and Tom, I suggest to pull it into release_33 as cleanups.
> >
> >
> > 2013/5/13 Rafael Espindola <rafael.espindola at gmail.com>:
> > > Author: rafael
> > > Date: Mon May 13 09:34:48 2013
> > > New Revision: 181706
> > >
> > > URL: http://llvm.org/viewvc/llvm-project?rev=181706&view=rev
> > > Log:
> > > Remove unused fields and arguments.
> > >
> > > Modified:
> > >     llvm/trunk/lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.cpp
> > >     llvm/trunk/lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.h
> > >     llvm/trunk/lib/Target/R600/MCTargetDesc/R600MCCodeEmitter.cpp
> > >
> > > Modified: llvm/trunk/lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.cpp
> > > URL:
> > http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.cpp?rev=181706&r1=181705&r2=181706&view=diff
> > >
> > ==============================================================================
> > > --- llvm/trunk/lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.cpp
> > (original)
> > > +++ llvm/trunk/lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.cpp Mon
> > May 13 09:34:48 2013
> > > @@ -78,7 +78,7 @@ static MCCodeEmitter *createAMDGPUMCCode
> > >    if (STI.getFeatureBits() & AMDGPU::Feature64BitPtr) {
> > >      return createSIMCCodeEmitter(MCII, MRI, STI, Ctx);
> > >    } else {
> > > -    return createR600MCCodeEmitter(MCII, MRI, STI, Ctx);
> > > +    return createR600MCCodeEmitter(MCII, MRI);
> > >    }
> > >  }
> > >
> > >
> > > Modified: llvm/trunk/lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.h
> > > URL:
> > http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.h?rev=181706&r1=181705&r2=181706&view=diff
> > >
> > ==============================================================================
> > > --- llvm/trunk/lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.h
> > (original)
> > > +++ llvm/trunk/lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.h Mon May
> > 13 09:34:48 2013
> > > @@ -32,9 +32,7 @@ class raw_ostream;
> > >  extern Target TheAMDGPUTarget;
> > >
> > >  MCCodeEmitter *createR600MCCodeEmitter(const MCInstrInfo &MCII,
> > > -                                       const MCRegisterInfo &MRI,
> > > -                                       const MCSubtargetInfo &STI,
> > > -                                       MCContext &Ctx);
> > > +                                       const MCRegisterInfo &MRI);
> > >
> > >  MCCodeEmitter *createSIMCCodeEmitter(const MCInstrInfo &MCII,
> > >                                       const MCRegisterInfo &MRI,
> > >
> > > Modified: llvm/trunk/lib/Target/R600/MCTargetDesc/R600MCCodeEmitter.cpp
> > > URL:
> > http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/R600/MCTargetDesc/R600MCCodeEmitter.cpp?rev=181706&r1=181705&r2=181706&view=diff
> > >
> > ==============================================================================
> > > --- llvm/trunk/lib/Target/R600/MCTargetDesc/R600MCCodeEmitter.cpp
> > (original)
> > > +++ llvm/trunk/lib/Target/R600/MCTargetDesc/R600MCCodeEmitter.cpp Mon
> > May 13 09:34:48 2013
> > > @@ -35,14 +35,11 @@ class R600MCCodeEmitter : public AMDGPUM
> > >    void operator=(const R600MCCodeEmitter &) LLVM_DELETED_FUNCTION;
> > >    const MCInstrInfo &MCII;
> > >    const MCRegisterInfo &MRI;
> > > -  const MCSubtargetInfo &STI;
> > > -  MCContext &Ctx;
> > >
> > >  public:
> > >
> > > -  R600MCCodeEmitter(const MCInstrInfo &mcii, const MCRegisterInfo &mri,
> > > -                    const MCSubtargetInfo &sti, MCContext &ctx)
> > > -    : MCII(mcii), MRI(mri), STI(sti), Ctx(ctx) { }
> > > +  R600MCCodeEmitter(const MCInstrInfo &mcii, const MCRegisterInfo &mri)
> > > +    : MCII(mcii), MRI(mri) { }
> > >
> > >    /// \brief Encode the instruction and write it to the OS.
> > >    virtual void EncodeInstruction(const MCInst &MI, raw_ostream &OS,
> > > @@ -98,10 +95,8 @@ enum TextureTypes {
> > >  };
> > >
> > >  MCCodeEmitter *llvm::createR600MCCodeEmitter(const MCInstrInfo &MCII,
> > > -                                           const MCRegisterInfo &MRI,
> > > -                                           const MCSubtargetInfo &STI,
> > > -                                           MCContext &Ctx) {
> > > -  return new R600MCCodeEmitter(MCII, MRI, STI, Ctx);
> > > +                                           const MCRegisterInfo &MRI) {
> > > +  return new R600MCCodeEmitter(MCII, MRI);
> > >  }
> > >
> > >  void R600MCCodeEmitter::EncodeInstruction(const MCInst &MI, raw_ostream
> > &OS,
> > >
> > >
> > > _______________________________________________
> > > llvm-commits mailing list
> > > llvm-commits at cs.uiuc.edu
> > > http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
> >

> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits