Fix dotnet#17447

KevinRansom · Jul 25, 2024 · 9fa6ce1 · 9fa6ce1
1 parent db4ad94
commit 9fa6ce1
Show file tree

Hide file tree

Showing 15 changed files with 62 additions and 74 deletions.
diff --git a/src/Compiler/Checking/AugmentWithHashCompare.fs b/src/Compiler/Checking/AugmentWithHashCompare.fs
@@ -1297,7 +1297,8 @@ let MakeValsForCompareAugmentation g (tcref: TyconRef) =
     let m = tcref.Range
     let _, ty = mkMinimalTy g tcref
     let tps = tcref.Typars m
-    let vis = tcref.TypeReprAccessibility
+    // CompareTo augments are always public
+    let vis = taccessPublic
 
     mkValSpec g tcref ty vis (Some(mkIComparableCompareToSlotSig g)) "CompareTo" (tps +-> (mkCompareObjTy g ty)) unaryArg false,
     mkValSpec g tcref ty vis (Some(mkGenericIComparableCompareToSlotSig g ty)) "CompareTo" (tps +-> (mkCompareTy g ty)) unaryArg false
@@ -1306,7 +1307,8 @@ let MakeValsForCompareWithComparerAugmentation g (tcref: TyconRef) =
     let m = tcref.Range
     let _, ty = mkMinimalTy g tcref
     let tps = tcref.Typars m
-    let vis = tcref.TypeReprAccessibility
+    // CompareTo augments are always public
+    let vis = taccessPublic
 
     mkValSpec
         g
@@ -1322,7 +1324,8 @@ let MakeValsForCompareWithComparerAugmentation g (tcref: TyconRef) =
 let MakeValsForEqualsAugmentation g (tcref: TyconRef) =
     let m = tcref.Range
     let _, ty = mkMinimalTy g tcref
-    let vis = tcref.TypeReprAccessibility
+    // Equals augments are always public
+    let vis = taccessPublic
     let tps = tcref.Typars m
 
     let objEqualsVal =
@@ -1347,11 +1350,9 @@ let MakeValsForEqualsAugmentation g (tcref: TyconRef) =
 
 let MakeValsForEqualityWithComparerAugmentation g (tcref: TyconRef) =
     let _, ty = mkMinimalTy g tcref
-    let vis =
-        // Equality method for union types match the union type visibility rather than the TypeReprAccessibility
-        if tcref.IsUnionTycon then tcref.Accessibility
-        else tcref.TypeReprAccessibility
     let tps = tcref.Typars tcref.Range
+    // GetHashCode and Equals augments are always public
+    let vis = taccessPublic
 
     let objGetHashCodeVal =
         mkValSpec g tcref ty vis (Some(mkGetHashCodeSlotSig g)) "GetHashCode" (tps +-> (mkHashTy g ty)) unitArg false

diff --git a/tests/FSharp.Compiler.ComponentTests/EmittedIL/CCtorDUWithMember/CCtorDUWithMember.fs b/tests/FSharp.Compiler.ComponentTests/EmittedIL/CCtorDUWithMember/CCtorDUWithMember.fs
@@ -81,10 +81,6 @@ module CCtorDUWithMember =
         |> withAdditionalSourceFile (SourceFromPath (__SOURCE_DIRECTORY__ ++ "CCtorDUWithMember04.fs"))
         |> verifyCompilation 
 
-    let withRealInternalSignature realSig compilation =
-        compilation
-        |> withOptions [if realSig then "--realsig+" else "--realsig-" ]
-
     [<InlineData(true)>]        // RealSig
     [<InlineData(false)>]       // Regular
     [<Theory>]

diff --git a/tests/FSharp.Compiler.ComponentTests/EmittedIL/CompilerGeneratedAttributeOnAccessors.fs b/tests/FSharp.Compiler.ComponentTests/EmittedIL/CompilerGeneratedAttributeOnAccessors.fs
@@ -185,10 +185,6 @@ module ``Auto-generated accessors have CompilerGenerated attribute`` =
 // Regression: https://github.com/dotnet/fsharp/issues/14652
 module ``Let bindings in classes shoulnd't have DebuggerNonUserCodeAttribute`` =
 
-    let withRealInternalSignature realSig compilation =
-        compilation
-        |> withOptions [if realSig then "--realsig+" else "--realsig-" ]
-
     [<InlineData(true)>]        // RealSig
     [<InlineData(false)>]       // Regular
     [<Theory>]

diff --git a/...FSharp.Compiler.ComponentTests/EmittedIL/ComputationExpressions/ComputationExpressions.fs b/...FSharp.Compiler.ComponentTests/EmittedIL/ComputationExpressions/ComputationExpressions.fs
@@ -7,18 +7,10 @@ open FSharp.Test.Compiler
 
 module ComputationExpressions =
 
-    let withRealInternalSignature compilation =
-        compilation
-        |> withOptions ["--realsig+"]
-
-    let withoutRealInternalSignature compilation =
-        compilation
-        |> withOptions ["--realsig-"]
-
     let computationExprLibrary =
         FsFromPath (Path.Combine(__SOURCE_DIRECTORY__,  "ComputationExprLibrary.fs"))
         |> withName "ComputationExprLibrary"
-        |> withoutRealInternalSignature
+        |> withRealInternalSignatureOff
 
     let verifyCompilation compilation =
         compilation
@@ -35,84 +27,84 @@ module ComputationExpressions =
     [<Theory; Directory(__SOURCE_DIRECTORY__, BaselineSuffix=".RealInternalSignatureOn", Includes=[|"ComputationExpr01.fs"|])>]
     let ``ComputationExpr01_realsig=true`` compilation =
         compilation
-        |> withRealInternalSignature
+        |> withRealInternalSignatureOn
         |> verifyCompilation
 
     [<Theory; Directory(__SOURCE_DIRECTORY__, BaselineSuffix=".RealInternalSignatureOff", Includes=[|"ComputationExpr01.fs"|])>]
     let ``ComputationExpr01_realsig=false`` compilation =
         compilation
-        |> withoutRealInternalSignature
+        |> withRealInternalSignatureOff
         |> verifyCompilation
 
     [<Theory; Directory(__SOURCE_DIRECTORY__, BaselineSuffix=".RealInternalSignatureOn", Includes=[|"ComputationExpr02.fs"|])>]
     let ``ComputationExpr02_realsig=true`` compilation =
         compilation
-        |> withRealInternalSignature
+        |> withRealInternalSignatureOn
         |> verifyCompilation
 
     [<Theory; Directory(__SOURCE_DIRECTORY__, BaselineSuffix=".RealInternalSignatureOff", Includes=[|"ComputationExpr02.fs"|])>]
     let ``ComputationExpr02_realsig=false`` compilation =
         compilation
-        |> withoutRealInternalSignature
+        |> withRealInternalSignatureOff
         |> verifyCompilation
 
     [<Theory; Directory(__SOURCE_DIRECTORY__, BaselineSuffix=".RealInternalSignatureOn", Includes=[|"ComputationExpr03.fs"|])>]
     let ``ComputationExpr03_realsig=true`` compilation =
         compilation
-        |> withRealInternalSignature
+        |> withRealInternalSignatureOn
         |> verifyCompilation
 
     [<Theory; Directory(__SOURCE_DIRECTORY__, BaselineSuffix=".RealInternalSignatureOff", Includes=[|"ComputationExpr03.fs"|])>]
     let ``ComputationExpr03_realsig=false`` compilation =
         compilation
-        |> withoutRealInternalSignature
+        |> withRealInternalSignatureOff
         |> verifyCompilation
 
     [<Theory; Directory(__SOURCE_DIRECTORY__, BaselineSuffix=".RealInternalSignatureOn", Includes=[|"ComputationExpr04.fs"|])>]
     let ``ComputationExpr04_realsig=true`` compilation =
         compilation
-        |> withRealInternalSignature
+        |> withRealInternalSignatureOn
         |> verifyCompilation 
 
     [<Theory; Directory(__SOURCE_DIRECTORY__, BaselineSuffix=".RealInternalSignatureOff", Includes=[|"ComputationExpr04.fs"|])>]
     let ``ComputationExpr04_realsig=false`` compilation =
         compilation
-        |> withoutRealInternalSignature
+        |> withRealInternalSignatureOff
         |> verifyCompilation 
 
     [<Theory; Directory(__SOURCE_DIRECTORY__, BaselineSuffix=".RealInternalSignatureOn", Includes=[|"ComputationExpr05.fs"|])>]
     let ``ComputationExpr05_realsig=true`` compilation =
         compilation
-        |> withRealInternalSignature
+        |> withRealInternalSignatureOn
         |> verifyCompilation 
 
     [<Theory; Directory(__SOURCE_DIRECTORY__, BaselineSuffix=".RealInternalSignatureOff", Includes=[|"ComputationExpr05.fs"|])>]
     let ``ComputationExpr05_realsig=false`` compilation =
         compilation
-        |> withoutRealInternalSignature
+        |> withRealInternalSignatureOff
         |> verifyCompilation 
 
     [<Theory; Directory(__SOURCE_DIRECTORY__, BaselineSuffix=".RealInternalSignatureOn", Includes=[|"ComputationExpr06.fs"|])>]
     let ``ComputationExpr06_realsig=true`` compilation =
         compilation
-        |> withRealInternalSignature
+        |> withRealInternalSignatureOn
         |> verifyCompilation 
 
     [<Theory; Directory(__SOURCE_DIRECTORY__, BaselineSuffix=".RealInternalSignatureOff", Includes=[|"ComputationExpr06.fs"|])>]
     let ``ComputationExpr06_realsig=false`` compilation =
         compilation
-        |> withoutRealInternalSignature
+        |> withRealInternalSignatureOff
         |> verifyCompilation 
 
     [<Theory; Directory(__SOURCE_DIRECTORY__, BaselineSuffix=".RealInternalSignatureOn", Includes=[|"ComputationExpr07.fs"|])>]
     let ``ComputationExpr07_realsig=true`` compilation =
         compilation
-        |> withRealInternalSignature
+        |> withRealInternalSignatureOn
         |> verifyCompilation 
 
     [<Theory; Directory(__SOURCE_DIRECTORY__, BaselineSuffix=".RealInternalSignatureOff", Includes=[|"ComputationExpr07.fs"|])>]
     let ``ComputationExpr07_realsig=false`` compilation =
         compilation
-        |> withoutRealInternalSignature
+        |> withRealInternalSignatureOff
         |> withLangVersionPreview // TODO https://github.com/dotnet/fsharp/issues/16739: Remove this when LanguageFeature.LowerIntegralRangesToFastLoops is out of preview.
         |> verifyCompilation 
diff --git a/tests/FSharp.Compiler.ComponentTests/EmittedIL/GenericComparison/CrossAssembly.fs b/tests/FSharp.Compiler.ComponentTests/EmittedIL/GenericComparison/CrossAssembly.fs
@@ -91,3 +91,36 @@ Module1.Struct(1, 2) = Module1.Struct(2, 3) |> ignore"""
     IL_0031:  ret
   } 
 """ ]
+
+
+    [<InlineData(true)>]        // RealSig
+    [<InlineData(false)>]       // Regular
+    [<Theory>]
+    let ``Another assembly with private type`` (realsig) =
+        let module1 =
+            FSharpWithFileName "Module1.fs"
+                """
+module Module1
+    
+type Value =
+    private { value: uint32 }
+
+    static member Zero = { value = 0u }
+    static member Create(value: int) = { value = uint value } """
+            |> withRealInternalSignature realsig
+            |> withOptimize
+            |> asLibrary
+            |> withName "module1"
+
+        let module2 = 
+            FSharpWithFileName "Program.fs"
+                """
+open Module1
+
+Value.Zero = Value.Create 0 |> ignore"""
+
+        module2
+        |> withReferences [module1]
+        |> withOptimize
+        |> compileExeAndRun
+        |> shouldSucceed
diff --git a/tests/FSharp.Compiler.ComponentTests/EmittedIL/Inlining/Inlining.fs b/tests/FSharp.Compiler.ComponentTests/EmittedIL/Inlining/Inlining.fs
@@ -16,10 +16,6 @@ module Inlining =
         |> ignoreWarnings
         |> verifyILBaseline
 
-    let withRealInternalSignature realSig compilation =
-        compilation
-        |> withOptions [if realSig then "--realsig+" else "--realsig-" ]
-
     // SOURCE=Match01.fs SCFLAGS="-a --optimize+" COMPILE_ONLY=1 POSTCMD="..\\CompareIL.cmd Match01.dll"	# Match01.fs
     [<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"Match01_RealInternalSignatureOn.fs"|])>]
     let ``Match01_RealInternalSignatureOn_fs`` compilation =

diff --git a/...FSharp.Compiler.ComponentTests/EmittedIL/RealInternalSignature/ClassTypeInitialization.fs b/...FSharp.Compiler.ComponentTests/EmittedIL/RealInternalSignature/ClassTypeInitialization.fs
@@ -8,10 +8,6 @@ open FSharp.Test.Compiler
 
 module ClassTypeInitialization =
 
-    let withRealInternalSignature realSig compilation =
-        compilation
-        |> withOptions [if realSig then "--realsig+" else "--realsig-" ]
-
     [<InlineData(true)>]        // RealSig
     [<InlineData(false)>]       // Regular
     [<Theory>]

diff --git a/tests/FSharp.Compiler.ComponentTests/EmittedIL/RealInternalSignature/ClassTypeVisibility.fs b/tests/FSharp.Compiler.ComponentTests/EmittedIL/RealInternalSignature/ClassTypeVisibility.fs
@@ -8,10 +8,6 @@ open FSharp.Test.Compiler
 
 module ClassTypeVisibilityModuleRoot =
 
-    let withRealInternalSignature realSig compilation =
-        compilation
-        |> withOptions [if realSig then "--realsig+" else "--realsig-" ]
-
     [<InlineData(true)>]        // RealSig
     [<InlineData(false)>]       // Regular
     [<Theory>]

diff --git a/....Compiler.ComponentTests/EmittedIL/RealInternalSignature/ClassTypeVisibilityModuleRoot.fs b/....Compiler.ComponentTests/EmittedIL/RealInternalSignature/ClassTypeVisibilityModuleRoot.fs
@@ -8,10 +8,6 @@ open FSharp.Test.Compiler
 
 module ClassTypeVisibilityModuleRoot =
 
-    let withRealInternalSignature realSig compilation =
-        compilation
-        |> withOptions [if realSig then "--realsig+" else "--realsig-" ]
-
     [<InlineData(true)>]        // RealSig
     [<InlineData(false)>]       // Regular
     [<Theory>]

diff --git a/...er.ComponentTests/EmittedIL/RealInternalSignature/ClassTypeVisibilityModuleRootWithFsi.fs b/...er.ComponentTests/EmittedIL/RealInternalSignature/ClassTypeVisibilityModuleRootWithFsi.fs
@@ -7,10 +7,6 @@ open FSharp.Test.Compiler
 
 module ClassTypeVisibilityModuleRootWithFsi =
 
-    let withRealInternalSignature realSig compilation =
-        compilation
-        |> withOptions [if realSig then "--realsig+" else "--realsig-" ]
-
     [<InlineData(true)>]        // RealSig
     [<InlineData(false)>]       // Regular
     [<Theory>]

diff --git a/...mpiler.ComponentTests/EmittedIL/RealInternalSignature/ClassTypeVisibilityNamespaceRoot.fs b/...mpiler.ComponentTests/EmittedIL/RealInternalSignature/ClassTypeVisibilityNamespaceRoot.fs
@@ -8,10 +8,6 @@ open FSharp.Test.Compiler
 
 module ClassTypeVisibilityNamespaceRoot =
 
-    let withRealInternalSignature realSig compilation =
-        compilation
-        |> withOptions [if realSig then "--realsig+" else "--realsig-" ]
-
     [<InlineData(true)>]        // RealSig
     [<InlineData(false)>]       // Regular
     [<Theory>]

diff --git a/...ComponentTests/EmittedIL/RealInternalSignature/ClassTypeVisibilityNamespaceRootWithFsi.fs b/...ComponentTests/EmittedIL/RealInternalSignature/ClassTypeVisibilityNamespaceRootWithFsi.fs
@@ -7,10 +7,6 @@ open FSharp.Test.Compiler
 
 module ClassTypeVisibilityNamespaceRootWithFsi =
 
-    let withRealInternalSignature realSig compilation =
-        compilation
-        |> withOptions [if realSig then "--realsig+" else "--realsig-" ]
-
     [<InlineData(true)>]        // RealSig
     [<InlineData(false)>]       // Regular
     [<Theory>]

diff --git a/tests/FSharp.Compiler.ComponentTests/EmittedIL/RealInternalSignature/ModuleInitialization.fs b/tests/FSharp.Compiler.ComponentTests/EmittedIL/RealInternalSignature/ModuleInitialization.fs
@@ -8,10 +8,6 @@ open FSharp.Test.Compiler
 
 module ModuleInitialization =
 
-    let withRealInternalSignature realSig compilation =
-        compilation
-        |> withOptions [if realSig then "--realsig+" else "--realsig-" ]
-
     let simplePublicModule =
         FSharp """
 namespace MyLibraryNamespace

diff --git a/...s/FSharp.Compiler.ComponentTests/EmittedIL/RealInternalSignature/RealInternalSignature.fs b/...s/FSharp.Compiler.ComponentTests/EmittedIL/RealInternalSignature/RealInternalSignature.fs
@@ -8,10 +8,6 @@ open FSharp.Test.Compiler
 
 module RealInternalSignature =
 
-    let withRealInternalSignature realSig compilation =
-        compilation
-        |> withOptions [if realSig then "--realsig+" else "--realsig-" ]
-
     let simplePublicModule =
         FSharp """
 namespace MyLibraryNamespace

diff --git a/tests/FSharp.Test.Utilities/Compiler.fs b/tests/FSharp.Test.Utilities/Compiler.fs
@@ -601,6 +601,12 @@ module rec Compiler =
         | FS fs -> FS { fs with Options = fs.Options @ ["--realsig+"] }
         | _ -> failwith "withRealInternalSignatureOn only supported by f#"
 
+    let withRealInternalSignature (realSig: bool) (cUnit: CompilationUnit) : CompilationUnit  =
+        if realSig then
+            cUnit |>  withRealInternalSignatureOn
+        else
+            cUnit |>  withRealInternalSignatureOff
+
     let asExe (cUnit: CompilationUnit) : CompilationUnit =
         withOutputType CompileOutput.Exe cUnit