Skip to content

Always emit conditional attributes in FCS #6004

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jan 16, 2019
Merged

Always emit conditional attributes in FCS #6004

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4291fb1
Always emit conditional attributes in FCS (fixes #3890)
auduchinok Dec 12, 2018
fd3e381
Add test
auduchinok Dec 12, 2018
b927b48
Cleanup test
auduchinok Dec 12, 2018
58049b7
Add internal compiler switch, emit conditional method calls
auduchinok Dec 22, 2018
7965070
Update test
auduchinok Dec 22, 2018
a6a15f9
Make noConditionalErasure lowercase
auduchinok Jan 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/fsharp/TypeChecker.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10829,8 +10829,10 @@ and TcAttribute canFail cenv (env: TcEnv) attrTgt (synAttr: SynAttribute) =
let conditionalCallDefineOpt = TryFindTyconRefStringAttribute cenv.g mAttr cenv.g.attrib_ConditionalAttribute tcref

match conditionalCallDefineOpt with
#if !COMPILER_SERVICE_AS_DLL
| Some d when not (List.contains d cenv.conditionalDefines) ->
[], false
#endif
| _ ->

// REVIEW: take notice of inherited?
Expand Down
25 changes: 24 additions & 1 deletion tests/service/Symbols.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,4 +100,27 @@ module Mod2 =
mod1val1.XmlDocSig |> shouldEqual "P:Mod1.val1"
mod2func2.XmlDocSig |> shouldEqual "M:Mod1.Mod2.func2"



module Attributes =
[<Test>]
let ``Emit conditional attributes`` () =
let source = """
open System
open System.Diagnostics

[<Conditional("Bar")>]
type FooAttribute() =
inherit Attribute()

[<Foo>]
let x = 123
"""
let fileName, options = mkTestFileAndOptions source [| |]
let _, checkResults = parseAndCheckFile fileName source options

checkResults.GetAllUsesOfAllSymbolsInFile()
|> Async.RunSynchronously
|> Array.tryFind (fun su -> su.Symbol.DisplayName = "x")
|> Option.orElseWith (fun _ -> failwith "Could not get symbol")
|> Option.map (fun su -> su.Symbol :?> FSharpMemberOrFunctionOrValue)
|> Option.iter (fun symbol -> symbol.Attributes.Count |> shouldEqual 1)