Commit 4ab405d8 authored by Bill Wendling's avatar Bill Wendling
Browse files

Merge AutoUpgrade of EH magic variable. 

$ svn merge -c 113600 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r113600 into '.':
A    test/Bitcode/AutoUpgradeGlobals.ll
A    test/Bitcode/AutoUpgradeGlobals.ll.bc
U    include/llvm/AutoUpgrade.h
U    lib/Bitcode/Reader/BitcodeReader.cpp
U    lib/VMCore/AutoUpgrade.cpp
$ svn merge -c 113603 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r113603 into '.':
G    lib/VMCore/AutoUpgrade.cpp
$ svn merge -c 113615 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r113615 into '.':
G    lib/VMCore/AutoUpgrade.cpp

llvm-svn: 114020
parent 42e23e97

llvm/include/llvm/AutoUpgrade.h

+5 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


namespace llvm {

  class Module;

  class GlobalVariable;

  class Function;

  class CallInst;
@@ -35,6 +36,10 @@ namespace llvm { 
  /// so that it can update all calls to the old function.

  void UpgradeCallsToIntrinsic(Function* F);



  /// This checks for global variables which should be upgraded. It returns true

  /// if it requires upgrading.

  bool UpgradeGlobalVariable(GlobalVariable *GV);



  /// This function checks debug info intrinsics. If an intrinsic is invalid

  /// then this function simply removes the intrinsic. 

  void CheckDebugInfoIntrinsics(Module *M);

llvm/lib/Bitcode/Reader/BitcodeReader.cpp

+6 −0
Original line number Diff line number Diff line
@@ -1297,6 +1297,12 @@ bool BitcodeReader::ParseModule() { 
          UpgradedIntrinsics.push_back(std::make_pair(FI, NewFn));

      }



      // Look for global variables which need to be renamed.

      for (Module::global_iterator

             GI = TheModule->global_begin(), GE = TheModule->global_end();

           GI != GE; ++GI)

        UpgradeGlobalVariable(GI);



      // Force deallocation of memory for these vectors to favor the client that

      // want lazy deserialization.

      std::vector<std::pair<GlobalVariable*, unsigned> >().swap(GlobalInits);

llvm/lib/VMCore/AutoUpgrade.cpp

+12 −0
Original line number Diff line number Diff line
@@ -365,6 +365,18 @@ bool llvm::UpgradeIntrinsicFunction(Function *F, Function *&NewFn) { 
  return Upgraded;

}



bool llvm::UpgradeGlobalVariable(GlobalVariable *GV) {

  StringRef Name(GV->getName());



  // We are only upgrading one symbol here.

  if (Name == ".llvm.eh.catch.all.value") {

    GV->setName("llvm.eh.catch.all.value");

    return true;

  }



  return false;

}



/// ExtendNEONArgs - For NEON "long" and "wide" operations, where the results

/// have vector elements twice as big as one or both source operands, do the

/// sign- or zero-extension that used to be handled by intrinsics.  The

llvm/test/Bitcode/AutoUpgradeGlobals.ll

0 → 100644
+3 −0
Original line number Diff line number Diff line 
; This isn't really an assembly file. It just runs test on bitcode to ensure

; it is auto-upgraded.

; RUN: llvm-dis < %s.bc | not grep {i32 @\\.llvm\\.eh}

llvm/test/Bitcode/AutoUpgradeGlobals.ll.bc

0 → 100644
+312 B

File added.

No diff preview for this file type.

View file