Skip to content

Commit ad468da

Browse files
committed
Revert "Seperate frontend changes, add debug directives, remove redundant stuff from tests"
This reverts commit 1a908c6.
1 parent 1a908c6 commit ad468da

File tree

4 files changed

+3
-7
lines changed

4 files changed

+3
-7
lines changed

clang/lib/CodeGen/CGCall.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5086,7 +5086,7 @@ RValue CodeGenFunction::EmitCall(const CGFunctionInfo &CallInfo,
50865086
RawAddress SRetAlloca = RawAddress::invalid();
50875087
llvm::Value *UnusedReturnSizePtr = nullptr;
50885088
if (RetAI.isIndirect() || RetAI.isInAlloca() || RetAI.isCoerceAndExpand()) {
5089-
if (IsVirtualFunctionPointerThunk && RetAI.isIndirect()) {
5089+
if ((IsVirtualFunctionPointerThunk || IsMustTail) && RetAI.isIndirect()) {
50905090
SRetPtr = makeNaturalAddressForPointer(CurFn->arg_begin() +
50915091
IRFunctionArgs.getSRetArgNo(),
50925092
RetTy, CharUnits::fromQuantity(1));

llvm/include/llvm/CodeGen/CallingConvLower.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -540,9 +540,7 @@ class CCState {
540540
});
541541
}
542542

543-
#ifndef NDEBUG
544543
void dump() const;
545-
#endif
546544

547545
private:
548546
/// MarkAllocated - Mark a register and all of its aliases as allocated.

llvm/lib/CodeGen/CallingConvLower.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,6 @@ bool CCState::resultsCompatible(CallingConv::ID CalleeCC,
291291
RVLocs2.end(), AreCompatible);
292292
}
293293

294-
#ifndef NDEBUG
295294
void CCState::dump() const {
296295
dbgs() << "CCState:\n";
297296
for (const CCValAssign &Loc : Locs) {
@@ -352,4 +351,3 @@ void CCState::dump() const {
352351
dbgs() << "\n";
353352
}
354353
}
355-
#endif

llvm/test/CodeGen/ARM/tail-call-float.ll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --version 5
22
; RUN: llc -mtriple armv7 -target-abi aapcs -float-abi soft -O0 -o - < %s \
3-
; RUN: | FileCheck %s -check-prefix CHECK-SOFT
3+
; RUN: | FileCheck %s -check-prefix CHECK-SOFT -check-prefix CHECK
44
; RUN: llc -mtriple armv7 -target-abi aapcs -float-abi hard -O0 -o - < %s \
5-
; RUN: | FileCheck %s -check-prefix CHECK-HARD
5+
; RUN: | FileCheck %s -check-prefix CHECK-HARD -check-prefix CHECK
66

77
; Tests for passing floating-point regs. Variadic functions will always use
88
; general-purpose registers. Standard functions will use the floating-point

0 commit comments

Comments
 (0)