This is an archive of the discontinued LLVM Phabricator instance.

Differential D67864

[CodeView] Add pragma push/pop_macro for ARM64_FPSR to enum header
ClosedPublic

Authored by mstorsjo on Sep 20 2019, 1:53 PM.

Details

Reviewers
rnk
TomTan
mgrang
ssijaric
Commits
rG1bfdab52a76b: [CodeView] Add pragma push/pop_macro for ARM64_FPSR to enum header
rL372481: [CodeView] Add pragma push/pop_macro for ARM64_FPSR to enum header
Summary

This fixes (one aspect of) compilation of LLDB with MSVC for ARM64.

LLDB source files include intrin.h, and the MSVC intrin.h transitively includes arm64intr.h, which has an ARM64_FPSR define, which clashes with the enum declaration.

Diff Detail

Repository
rL LLVM

Event Timeline

mstorsjo created this revision.Sep 20 2019, 1:53 PM
Herald added a project: Restricted Project. · View Herald TranscriptSep 20 2019, 1:53 PM
Herald added a subscriber: kristof.beyls. · View Herald Transcript
TomTan added a comment.Sep 20 2019, 2:13 PM

Thanks for catching this. Could the #pragma push and #undef be moved to the line right before CV_REGISTER(ARM64_FPSR, 220). An inline commend will also be great.

mstorsjo added a comment.Sep 20 2019, 2:19 PM
In D67864#1677495, @TomTan wrote:

Thanks for catching this. Could the #pragma push and #undef be moved to the line right before CV_REGISTER(ARM64_FPSR, 220).

I guess I could, but the file has a predecent for this kind of placement (for CR0) as well.

An inline commend will also be great.

Sure, I'll add that.

mstorsjo updated this revision to Diff 221115.Sep 20 2019, 2:25 PM

Added a comment.

TomTan accepted this revision.Sep 20 2019, 2:37 PM

LGTM.

This revision is now accepted and ready to land.Sep 20 2019, 2:37 PM
Closed by commit rL372481: [CodeView] Add pragma push/pop_macro for ARM64_FPSR to enum header (authored by mstorsjo). · Explain WhySep 21 2019, 12:08 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
llvm/
trunk/
include/
llvm/
DebugInfo/
CodeView/
7 lines

Diff 221191

llvm/trunk/include/llvm/DebugInfo/CodeView/CodeViewRegisters.def

Show First 20 Lines • Show All 483 Lines • ▼ Show 20 Lines
CV_REGISTER(ARM_NQ13, 413) CV_REGISTER(ARM_NQ13, 413)
CV_REGISTER(ARM_NQ14, 414) CV_REGISTER(ARM_NQ14, 414)
CV_REGISTER(ARM_NQ15, 415) CV_REGISTER(ARM_NQ15, 415)
#endif // defined(CV_REGISTERS_ALL) || defined(CV_REGISTERS_ARM) #endif // defined(CV_REGISTERS_ALL) || defined(CV_REGISTERS_ARM)
#if defined(CV_REGISTERS_ALL) || defined(CV_REGISTERS_ARM64) #if defined(CV_REGISTERS_ALL) || defined(CV_REGISTERS_ARM64)
// arm64intr.h from MSVC defines ARM64_FPSR, which conflicts with
// these declarations.
#pragma push_macro("ARM64_FPSR")
#undef ARM64_FPSR
// ARM64 registers // ARM64 registers
CV_REGISTER(ARM64_NOREG, 0) CV_REGISTER(ARM64_NOREG, 0)
// General purpose 32-bit integer registers // General purpose 32-bit integer registers
CV_REGISTER(ARM64_W0, 10) CV_REGISTER(ARM64_W0, 10)
CV_REGISTER(ARM64_W1, 11) CV_REGISTER(ARM64_W1, 11)
▲ Show 20 Lines • Show All 172 Lines • ▼ Show 20 Lines
CV_REGISTER(ARM64_Q29, 209) CV_REGISTER(ARM64_Q29, 209)
CV_REGISTER(ARM64_Q30, 210) CV_REGISTER(ARM64_Q30, 210)
CV_REGISTER(ARM64_Q31, 211) CV_REGISTER(ARM64_Q31, 211)
// Floating point status register // Floating point status register
CV_REGISTER(ARM64_FPSR, 220) CV_REGISTER(ARM64_FPSR, 220)
#pragma pop_macro("ARM64_FPSR")
#endif // defined(CV_REGISTERS_ALL) || defined(CV_REGISTERS_ARM64) #endif // defined(CV_REGISTERS_ALL) || defined(CV_REGISTERS_ARM64)