Revert "[DebugInfo] Correctly handle salvaged casts and split fragments at ISel"

Reverted due to build failure on windows bots.

This reverts commit bb1b0bc4e57428ce364d3d6c075ff03cb8973462.

1 files changed, 4 insertions, 9 deletions

diff --git a/llvm/lib/IR/DebugInfoMetadata.cpp b/llvm/lib/IR/DebugInfoMetadata.cpp
index 8970fc15576..9b42a5a0e1b 100644
--- a/llvm/lib/IR/DebugInfoMetadata.cpp
+++ b/llvm/lib/IR/DebugInfoMetadata.cpp
@@ -1196,18 +1196,13 @@ bool DIExpression::isConstant() const {
   return true;
 }
 
-DIExpression::ExtOps DIExpression::getExtOps(unsigned FromSize, unsigned ToSize,
-                                             bool Signed) {
-  dwarf::TypeKind TK = Signed ? dwarf::DW_ATE_signed : dwarf::DW_ATE_unsigned;
-  DIExpression::ExtOps Ops({dwarf::DW_OP_LLVM_convert, FromSize, TK,
-                            dwarf::DW_OP_LLVM_convert, ToSize, TK});
-  return Ops;
-}
-
 DIExpression *DIExpression::appendExt(const DIExpression *Expr,
                                       unsigned FromSize, unsigned ToSize,
                                       bool Signed) {
-  return appendToStack(Expr, getExtOps(FromSize, ToSize, Signed));
+  dwarf::TypeKind TK = Signed ? dwarf::DW_ATE_signed : dwarf::DW_ATE_unsigned;
+  uint64_t Ops[] = {dwarf::DW_OP_LLVM_convert, FromSize, TK,
+                    dwarf::DW_OP_LLVM_convert, ToSize,   TK};
+  return appendToStack(Expr, Ops);
 }
 
 DIGlobalVariableExpression *