This is an archive of the discontinued LLVM Phabricator instance.

Differential D69636

Make flang driver stuff work on macOS
ClosedPublic

Authored by thakis on Oct 30 2019, 12:56 PM.

Details

Reviewers
peterwaller-arm
Commits
rG4b6597f49896: Make flang driver stuff work on macOS
Summary

6bf55804 added special-case code for TY_PP_Fortran to
ToolChain::LookupTypeForExtension(), but
Darwin::LookupTypeForExtension() overrode that method without calling
the superclass implementation.

Make it call the superclass implementation to fix things.

Diff Detail

Event Timeline

thakis created this revision.Oct 30 2019, 12:56 PM
thakis mentioned this in rG6bf55804924d: [clang][driver] Add basic --driver-mode=flang support for fortran.
thakis retitled this revision from Make flang driver stuff wrok on macOS to Make flang driver stuff work on macOS.Oct 30 2019, 1:07 PM
thakis mentioned this in D63607: [clang][driver] Add basic --driver-mode=flang support for fortran.Oct 30 2019, 5:07 PM
peterwaller-arm accepted this revision.Oct 31 2019, 2:13 AM

LGTM, thanks!

This revision is now accepted and ready to land.Oct 31 2019, 2:13 AM
Closed by commit rG4b6597f49896: Make flang driver stuff work on macOS (authored by thakis). · Explain WhyOct 31 2019, 4:40 AM
This revision was automatically updated to reflect the committed changes.
Herald added a project: Restricted Project. · View Herald TranscriptOct 31 2019, 4:40 AM
Herald added a subscriber: cfe-commits. · View Herald Transcript

Revision Contents

PathSize
clang/
lib/
Driver/
ToolChains/
2 lines
test/
Driver/
flang/
4 lines

Diff 227263

clang/lib/Driver/ToolChains/Darwin.cpp

Show First 20 Lines • Show All 731 Lines • ▼ Show 20 Lines
} }
/// Darwin - Darwin tool chain for i386 and x86_64. /// Darwin - Darwin tool chain for i386 and x86_64.
Darwin::Darwin(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) Darwin::Darwin(const Driver &D, const llvm::Triple &Triple, const ArgList &Args)
: MachO(D, Triple, Args), TargetInitialized(false), : MachO(D, Triple, Args), TargetInitialized(false),
CudaInstallation(D, Triple, Args) {} CudaInstallation(D, Triple, Args) {}
types::ID MachO::LookupTypeForExtension(StringRef Ext) const { types::ID MachO::LookupTypeForExtension(StringRef Ext) const {
types::ID Ty = types::lookupTypeForExtension(Ext); types::ID Ty = ToolChain::lookupTypeForExtension(Ext);
// Darwin always preprocesses assembly files (unless -x is used explicitly). // Darwin always preprocesses assembly files (unless -x is used explicitly).
if (Ty == types::TY_PP_Asm) if (Ty == types::TY_PP_Asm)
return types::TY_Asm; return types::TY_Asm;
return Ty; return Ty;
} }
▲ Show 20 Lines • Show All 1,867 Lines • Show Last 20 Lines

clang/test/Driver/flang/flang.f90

! D63607 made mac builders unhappy by failing this test, and it isn't
! yet obvious why. Mark as unsupported as a temporary measure.
! UNSUPPORTED: darwin
! Check that flang -fc1 is invoked when in --driver-mode=flang. ! Check that flang -fc1 is invoked when in --driver-mode=flang.
! This is a copy of flang_ucase.F90 because the driver has logic in it which ! This is a copy of flang_ucase.F90 because the driver has logic in it which
! differentiates between F90 and f90 files. Flang will not treat these files ! differentiates between F90 and f90 files. Flang will not treat these files
! differently. ! differently.
! Test various output types: ! Test various output types:
! * -E ! * -E
▲ Show 20 Lines • Show All 43 Lines • Show Last 20 Lines