[llvm] r344515 - [mips][micromips] Revert "Fix overlaping FDEs error"

[Rui Ueyama via llvm-commits]

When you revert a commit, please write a reason as to why you are reverting
as a commit message.

On Mon, Oct 15, 2018 at 7:38 AM Aleksandar Beserminji via llvm-commits <
llvm-commits at lists.llvm.org> wrote:

> Author: abeserminji
> Date: Mon Oct 15 07:36:48 2018
> New Revision: 344515
>
> URL: http://llvm.org/viewvc/llvm-project?rev=344515&view=rev
> Log:
> [mips][micromips] Revert "Fix overlaping FDEs error"
>
> This reverts r344511.
>
> Removed:
>     llvm/trunk/test/DebugInfo/Mips/eh_frame.ll
> Modified:
>     llvm/trunk/lib/Target/Mips/MCTargetDesc/MipsELFStreamer.cpp
>     llvm/trunk/lib/Target/Mips/MCTargetDesc/MipsELFStreamer.h
>
> Modified: llvm/trunk/lib/Target/Mips/MCTargetDesc/MipsELFStreamer.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MCTargetDesc/MipsELFStreamer.cpp?rev=344515&r1=344514&r2=344515&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/Target/Mips/MCTargetDesc/MipsELFStreamer.cpp (original)
> +++ llvm/trunk/lib/Target/Mips/MCTargetDesc/MipsELFStreamer.cpp Mon Oct 15
> 07:36:48 2018
> @@ -15,7 +15,6 @@
>  #include "llvm/MC/MCAssembler.h"
>  #include "llvm/MC/MCCodeEmitter.h"
>  #include "llvm/MC/MCContext.h"
> -#include "llvm/MC/MCDwarf.h"
>  #include "llvm/MC/MCInst.h"
>  #include "llvm/MC/MCObjectWriter.h"
>  #include "llvm/MC/MCSymbolELF.h"
> @@ -54,22 +53,6 @@ void MipsELFStreamer::EmitInstruction(co
>    createPendingLabelRelocs();
>  }
>
> -void MipsELFStreamer::EmitCFIStartProcImpl(MCDwarfFrameInfo &Frame) {
> -  Frame.Begin = getContext().createTempSymbol();
> -  MCELFStreamer::EmitLabel(Frame.Begin);
> -}
> -
> -MCSymbol *MipsELFStreamer::EmitCFILabel() {
> -  MCSymbol *Label = getContext().createTempSymbol("cfi", true);
> -  MCELFStreamer::EmitLabel(Label);
> -  return Label;
> -}
> -
> -void MipsELFStreamer::EmitCFIEndProcImpl(MCDwarfFrameInfo &Frame) {
> -  Frame.End = getContext().createTempSymbol();
> -  MCELFStreamer::EmitLabel(Frame.End);
> -}
> -
>  void MipsELFStreamer::createPendingLabelRelocs() {
>    MipsTargetELFStreamer *ELFTargetStreamer =
>        static_cast<MipsTargetELFStreamer *>(getTargetStreamer());
>
> Modified: llvm/trunk/lib/Target/Mips/MCTargetDesc/MipsELFStreamer.h
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MCTargetDesc/MipsELFStreamer.h?rev=344515&r1=344514&r2=344515&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/Target/Mips/MCTargetDesc/MipsELFStreamer.h (original)
> +++ llvm/trunk/lib/Target/Mips/MCTargetDesc/MipsELFStreamer.h Mon Oct 15
> 07:36:48 2018
> @@ -25,7 +25,6 @@ namespace llvm {
>  class MCAsmBackend;
>  class MCCodeEmitter;
>  class MCContext;
> -class MCDwarfFrameInfo;
>  class MCSubtargetInfo;
>
>  class MipsELFStreamer : public MCELFStreamer {
> @@ -61,12 +60,6 @@ public:
>    void EmitValueImpl(const MCExpr *Value, unsigned Size, SMLoc Loc)
> override;
>    void EmitIntValue(uint64_t Value, unsigned Size) override;
>
> -  // Overriding these functions allows us to avoid recording of these
> labels
> -  // in EmitLabel and later marking them as microMIPS.
> -  void EmitCFIStartProcImpl(MCDwarfFrameInfo &Frame) override;
> -  void EmitCFIEndProcImpl(MCDwarfFrameInfo &Frame) override;
> -  MCSymbol *EmitCFILabel() override;
> -
>    /// Emits all the option records stored up until the point it's called.
>    void EmitMipsOptionRecords();
>
>
> Removed: llvm/trunk/test/DebugInfo/Mips/eh_frame.ll
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/Mips/eh_frame.ll?rev=344514&view=auto
>
> ==============================================================================
> --- llvm/trunk/test/DebugInfo/Mips/eh_frame.ll (original)
> +++ llvm/trunk/test/DebugInfo/Mips/eh_frame.ll (removed)
> @@ -1,38 +0,0 @@
> -; RUN: llc -mtriple mips-unknown-linux-gnu -mattr=+micromips -O3
> -filetype=obj -o - %s | llvm-readelf -r | FileCheck %s
> -
> -; CHECK: .rel.eh_frame
> -; CHECK: DW.ref.__gxx_personality_v0
> -; CHECK-NEXT: .text
> -; CHECK-NEXT: .gcc_except_table
> -
> - at _ZTIi = external constant i8*
> -
> -define dso_local i32 @main() local_unnamed_addr personality i8* bitcast
> (i32 (...)* @__gxx_personality_v0 to i8*) {
> -entry:
> -  %exception.i = tail call i8* @__cxa_allocate_exception(i32 4) nounwind
> -  %0 = bitcast i8* %exception.i to i32*
> -  store i32 5, i32* %0, align 16
> -  invoke void @__cxa_throw(i8* %exception.i, i8* bitcast (i8** @_ZTIi to
> i8*), i8* null) noreturn
> -          to label %.noexc unwind label %return
> -
> -.noexc:
> -  unreachable
> -
> -return:
> -  %1 = landingpad { i8*, i32 }
> -          catch i8* null
> -  %2 = extractvalue { i8*, i32 } %1, 0
> -  %3 = tail call i8* @__cxa_begin_catch(i8* %2) nounwind
> -  tail call void @__cxa_end_catch()
> -  ret i32 0
> -}
> -
> -declare i32 @__gxx_personality_v0(...)
> -
> -declare i8* @__cxa_begin_catch(i8*) local_unnamed_addr
> -
> -declare void @__cxa_end_catch() local_unnamed_addr
> -
> -declare i8* @__cxa_allocate_exception(i32) local_unnamed_addr
> -
> -declare void @__cxa_throw(i8*, i8*, i8*) local_unnamed_addr
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20181015/665fdc03/attachment.html>