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
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment