Skip to content
This repository was archived by the owner on Feb 5, 2019. It is now read-only.

Commit 64eed05

Browse files
committed
Revert r206565 (and r206566 which updated tests).
This commit was attributed to a different person from the person who posted the patch to the list, and the person who posted it the list claimed when they did that they were not the author, but that the author was yet a third person. I don't know what is going on here, but reverting until the attribution is clear and the author has explicitly contributed the patch. Also, the review hasn't really involved any of the MC maintainers and that seems questionable too. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@206576 91177308-0d34-0410-b5e6-96231b3b80d8
1 parent fb96efa commit 64eed05

File tree

2 files changed

+8
-15
lines changed

2 files changed

+8
-15
lines changed

lib/MC/MCAsmStreamer.cpp

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1257,17 +1257,14 @@ void MCAsmStreamer::EmitWin64EHHandlerData() {
12571257
void MCAsmStreamer::EmitWin64EHPushReg(unsigned Register) {
12581258
MCStreamer::EmitWin64EHPushReg(Register);
12591259

1260-
OS << "\t.seh_pushreg ";
1261-
EmitRegisterName(Register);
1260+
OS << "\t.seh_pushreg " << Register;
12621261
EmitEOL();
12631262
}
12641263

12651264
void MCAsmStreamer::EmitWin64EHSetFrame(unsigned Register, unsigned Offset) {
12661265
MCStreamer::EmitWin64EHSetFrame(Register, Offset);
12671266

1268-
OS << "\t.seh_setframe ";
1269-
EmitRegisterName(Register);
1270-
OS << ", " << Offset;
1267+
OS << "\t.seh_setframe " << Register << ", " << Offset;
12711268
EmitEOL();
12721269
}
12731270

@@ -1281,18 +1278,14 @@ void MCAsmStreamer::EmitWin64EHAllocStack(unsigned Size) {
12811278
void MCAsmStreamer::EmitWin64EHSaveReg(unsigned Register, unsigned Offset) {
12821279
MCStreamer::EmitWin64EHSaveReg(Register, Offset);
12831280

1284-
OS << "\t.seh_savereg ";
1285-
EmitRegisterName(Register);
1286-
OS << ", " << Offset;
1281+
OS << "\t.seh_savereg " << Register << ", " << Offset;
12871282
EmitEOL();
12881283
}
12891284

12901285
void MCAsmStreamer::EmitWin64EHSaveXMM(unsigned Register, unsigned Offset) {
12911286
MCStreamer::EmitWin64EHSaveXMM(Register, Offset);
12921287

1293-
OS << "\t.seh_savexmm ";
1294-
EmitRegisterName(Register);
1295-
OS << ", " << Offset;
1288+
OS << "\t.seh_savexmm " << Register << ", " << Offset;
12961289
EmitEOL();
12971290
}
12981291

test/MC/AsmParser/directive_seh.s

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
# CHECK: .seh_proc func
44
# CHECK: .seh_pushframe @code
55
# CHECK: .seh_stackalloc 24
6-
# CHECK: .seh_savereg %rbp, 16
7-
# CHECK: .seh_savexmm %r8, 0
8-
# CHECK: .seh_pushreg %rbx
9-
# CHECK: .seh_setframe %rbx, 0
6+
# CHECK: .seh_savereg 6, 16
7+
# CHECK: .seh_savexmm 8, 0
8+
# CHECK: .seh_pushreg 3
9+
# CHECK: .seh_setframe 3, 0
1010
# CHECK: .seh_endprologue
1111
# CHECK: .seh_handler __C_specific_handler, @except
1212
# CHECK-NOT: .section{{.*}}.xdata

0 commit comments

Comments
 (0)