MCRegisterInfo: Merge getLLVMRegNum and getLLVMRegNumFromEH
authorPavel Labath <pavel@labath.sk>
Tue, 24 Sep 2019 09:31:02 +0000 (09:31 +0000)
committerPavel Labath <pavel@labath.sk>
Tue, 24 Sep 2019 09:31:02 +0000 (09:31 +0000)
commitd93e5a30d09891eb21efef56955030b14b342554
treed2f330b8c5df178dc1dd653301bbd6ac987be571
parent0709ddc1123dd977b7c7142f470024027aaac82a
MCRegisterInfo: Merge getLLVMRegNum and getLLVMRegNumFromEH

Summary:
The functions different in two ways:
- getLLVMRegNum could return both "eh" and "other" dwarf register
  numbers, while getLLVMRegNumFromEH only returned the "eh" number.
- getLLVMRegNum asserted if the register was not found, while the second
  function returned -1.

The second distinction was pretty important, but it was very hard to
infer that from the function name. Aditionally, for the use case of
dumping dwarf expressions, we needed a function which can work with both
kinds of number, but does not assert.

This patch solves both of these issues by merging the two functions into
one, returning an Optional<unsigned> value. While the same thing could
be achieved by adding an "IsEH" argument to the (renamed)
getLLVMRegNumFromEH function, it seemed better to avoid the confusion of
two functions and put the choice of asserting into the hands of the
caller -- if he checks the Optional value, he can safely process
"untrusted" input, and if he blindly dereferences the Optional, he gets
the assertion.

I've updated all call sites to the new API, choosing between the two
options according to the function they were calling originally, except
that I've updated the usage in DWARFExpression.cpp to use the "safe"
method instead, and added a test case which would have previously
triggered an assertion failure when processing (incorrect?) dwarf
expressions.

Reviewers: dsanders, arsenm, JDevlieghere

Subscribers: wdng, aprantl, javed.absar, llvm-commits

Tags: #llvm

Differential Revision: https://reviews.llvm.org/D67154

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@372710 91177308-0d34-0410-b5e6-96231b3b80d8
include/llvm/MC/MCRegisterInfo.h
lib/CodeGen/MachineOperand.cpp
lib/CodeGen/StackMaps.cpp
lib/DebugInfo/DWARF/DWARFExpression.cpp
lib/MC/MCAsmStreamer.cpp
lib/MC/MCRegisterInfo.cpp
lib/Target/AArch64/MCTargetDesc/AArch64AsmBackend.cpp
lib/Target/ARM/MCTargetDesc/ARMAsmBackend.cpp
lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp
test/DebugInfo/X86/dwarfdump-debug-loc-error-cases.s