Resolve merge conflicts

Author: RikkiGibson

docs/features/DefaultInterfaceImplementation.md

@@ -134,11 +134,7 @@ II.10.4 Method implementat ion requirements
 II.12 Semantics of interfaces
 Interfaces can have static fields and methods, but they shall not have instance fields or 
 methods. Interfaces can define virtual methods, but only if those methods are abstract 
-<<<<<<< HEAD
-(see Partition I and �II.15.4.2.4).
-=======
 (see Partition I and §II.15.4.2.4).
->>>>>>> upstream/main
 II.12.2 Implement ing virtual methods on interfaces
 If the class defines any public virtual methods whose name and signature
 match a virtual method on the interface, then add these to the list for that
@@ -153,11 +149,7 @@ It follows that instance methods shall only be defined in classes or value types
 but not in interfaces or outside of a type (i.e., globally).
 II.22.27 MethodImpl : 0x19
 The method indexed by MethodBody shall be a member of Class or some base class
-<<<<<<< HEAD
-of Class (MethodImpls do not allow compilers to �hook� arbitrary method bodies)
-=======
 of Class (MethodImpls do not allow compilers to ‘hook’ arbitrary method bodies)
->>>>>>> upstream/main
 II.22.37 TypeDef : 0x02
 All of the methods owned by an Interface (Flags.Interface = 1) shall be abstract
 (Flags.Abstract = 1)

src/Compilers/CSharp/Portable/CSharpResources.resx

@@ -363,16 +363,14 @@
   <data name="IDS_FeatureTypeVariance" xml:space="preserve">
     <value>type variance</value>
   </data>
-<<<<<<< HEAD
   <data name="IDS_ParameterNullChecking" xml:space="preserve">
     <value>parameter null-checking</value>
-=======
+  </data>
   <data name="IDS_Parameter" xml:space="preserve">
     <value>parameter</value>
   </data>
   <data name="IDS_Return" xml:space="preserve">
     <value>return</value>
->>>>>>> upstream/main
   </data>
   <data name="XML_InvalidToken" xml:space="preserve">
     <value>The character(s) '{0}' cannot be used at this location.</value>

src/Compilers/CSharp/Portable/Compiler/MethodCompiler.cs

@@ -1290,7 +1290,6 @@ forSemanticModel.Syntax is { } semanticModelSyntax &&
                                 boundStatements = boundStatements.Concat(ImmutableArray.Create(loweredBodyOpt));
                             }
 
-<<<<<<< HEAD
                             var factory = new SyntheticBoundNodeFactory(methodSymbol, syntax, compilationState, diagsForCurrentMethod);
 
                             // Iterators handled in IteratorRewriter.cs
@@ -1311,10 +1310,7 @@ forSemanticModel.Syntax is { } semanticModelSyntax &&
                                 }
                             }
                         }
-                        if (!(methodSymbol is SynthesizedStaticConstructor cctor) || cctor.ShouldEmit(processedInitializers.BoundInitializers))
-=======
                         if (_emitMethodBodies && (!(methodSymbol is SynthesizedStaticConstructor cctor) || cctor.ShouldEmit(processedInitializers.BoundInitializers)))
->>>>>>> upstream/main
                         {
                             var boundBody = BoundStatementList.Synthesized(syntax, boundStatements);
 

src/Compilers/CSharp/Portable/Errors/ErrorCode.cs

@@ -1882,17 +1882,6 @@ internal enum ErrorCode
         ERR_CopyConstructorWrongAccessibility = 8878,
         ERR_NonPrivateAPIInRecord = 8879,
 
-<<<<<<< HEAD
-        ERR_IncorrectNullCheckSyntax = 8890,
-        ERR_MustNullCheckInImplementation = 8891,
-        ERR_NonNullableValueTypeIsNullChecked = 8892,
-        WRN_NullCheckedHasDefaultNull = 8893,
-        ERR_NullCheckingOnByRefParameter = 8894,
-        WRN_NullCheckingOnNullableValueType = 8895,
-
-        #endregion diagnostics introduced for C# 9.0
-
-=======
         // The following warnings correspond to errors of the same name, but are reported
         // when a definite assignment issue is reported due to private fields imported from metadata.
         WRN_UnassignedThisAutoProperty = 8880,
@@ -2012,9 +2001,15 @@ internal enum ErrorCode
         WRN_MethGrpToNonDel = 8974,
         ERR_LambdaExplicitReturnTypeVar = 8975,
 
+        ERR_IncorrectNullCheckSyntax = 8990,
+        ERR_MustNullCheckInImplementation = 8991,
+        ERR_NonNullableValueTypeIsNullChecked = 8992,
+        WRN_NullCheckedHasDefaultNull = 8993,
+        ERR_NullCheckingOnByRefParameter = 8994,
+        WRN_NullCheckingOnNullableValueType = 8995,
+
         #endregion
 
->>>>>>> upstream/main
         // Note: you will need to re-generate compiler code after adding warnings (eng\generate-compiler-code.cmd)
     }
 }

src/Compilers/CSharp/Portable/Errors/MessageID.cs

@@ -208,10 +208,6 @@ internal enum MessageID
         IDS_FeatureNullPointerConstantPattern = MessageBase + 12783,
         IDS_FeatureModuleInitializers = MessageBase + 12784,
         IDS_FeatureTargetTypedConditional = MessageBase + 12785,
-<<<<<<< HEAD
-
-        IDS_ParameterNullChecking = MessageBase + 12786,
-=======
         IDS_FeatureCovariantReturnsForOverrides = MessageBase + 12786,
         IDS_FeatureExtensionGetEnumerator = MessageBase + 12787,
         IDS_FeatureExtensionGetAsyncEnumerator = MessageBase + 12788,
@@ -240,7 +236,7 @@ internal enum MessageID
         IDS_FeatureParameterlessStructConstructors = MessageBase + 12810,
         IDS_FeatureStructFieldInitializers = MessageBase + 12811,
         IDS_FeatureGenericAttributes = MessageBase + 12812,
->>>>>>> upstream/main
+        IDS_ParameterNullChecking = MessageBase + 12813,
     }
 
     // Message IDs may refer to strings that need to be localized.

src/Compilers/CSharp/Portable/Generated/CSharpSyntaxGenerator/CSharpSyntaxGenerator.SourceGenerator/Syntax.xml.Syntax.Generated.cs

@@ -13095,23 +13095,15 @@ public ParameterSyntax Update(SyntaxList<AttributeListSyntax> attributeLists, Sy
             return this;
         }
 
-<<<<<<< HEAD:src/Compilers/CSharp/Portable/Generated/Syntax.xml.Syntax.Generated.cs
-        public ParameterSyntax WithAttributeLists(SyntaxList<AttributeListSyntax> attributeLists) => Update(attributeLists, this.Modifiers, this.Type, this.Identifier, this.ExclamationExclamationToken, this.Default);
-        public ParameterSyntax WithModifiers(SyntaxTokenList modifiers) => Update(this.AttributeLists, modifiers, this.Type, this.Identifier, this.ExclamationExclamationToken, this.Default);
-        public ParameterSyntax WithType(TypeSyntax? type) => Update(this.AttributeLists, this.Modifiers, type, this.Identifier, this.ExclamationExclamationToken, this.Default);
-        public ParameterSyntax WithIdentifier(SyntaxToken identifier) => Update(this.AttributeLists, this.Modifiers, this.Type, identifier, this.ExclamationExclamationToken, this.Default);
-        public ParameterSyntax WithExclamationExclamationToken(SyntaxToken exclamationExclamationToken) => Update(this.AttributeLists, this.Modifiers, this.Type, this.Identifier, exclamationExclamationToken, this.Default);
-        public ParameterSyntax WithDefault(EqualsValueClauseSyntax? @default) => Update(this.AttributeLists, this.Modifiers, this.Type, this.Identifier, this.ExclamationExclamationToken, @default);
-=======
         internal override BaseParameterSyntax WithAttributeListsCore(SyntaxList<AttributeListSyntax> attributeLists) => WithAttributeLists(attributeLists);
-        public new ParameterSyntax WithAttributeLists(SyntaxList<AttributeListSyntax> attributeLists) => Update(attributeLists, this.Modifiers, this.Type, this.Identifier, this.Default);
+        public new ParameterSyntax WithAttributeLists(SyntaxList<AttributeListSyntax> attributeLists) => Update(attributeLists, this.Modifiers, this.Type, this.Identifier, this.ExclamationExclamationToken, this.Default);
         internal override BaseParameterSyntax WithModifiersCore(SyntaxTokenList modifiers) => WithModifiers(modifiers);
-        public new ParameterSyntax WithModifiers(SyntaxTokenList modifiers) => Update(this.AttributeLists, modifiers, this.Type, this.Identifier, this.Default);
+        public new ParameterSyntax WithModifiers(SyntaxTokenList modifiers) => Update(this.AttributeLists, modifiers, this.Type, this.Identifier, this.ExclamationExclamationToken, this.Default);
         internal override BaseParameterSyntax WithTypeCore(TypeSyntax? type) => WithType(type);
-        public new ParameterSyntax WithType(TypeSyntax? type) => Update(this.AttributeLists, this.Modifiers, type, this.Identifier, this.Default);
-        public ParameterSyntax WithIdentifier(SyntaxToken identifier) => Update(this.AttributeLists, this.Modifiers, this.Type, identifier, this.Default);
-        public ParameterSyntax WithDefault(EqualsValueClauseSyntax? @default) => Update(this.AttributeLists, this.Modifiers, this.Type, this.Identifier, @default);
->>>>>>> upstream/main:src/Compilers/CSharp/Portable/Generated/CSharpSyntaxGenerator/CSharpSyntaxGenerator.SourceGenerator/Syntax.xml.Syntax.Generated.cs
+        public new ParameterSyntax WithType(TypeSyntax? type) => Update(this.AttributeLists, this.Modifiers, type, this.Identifier, this.ExclamationExclamationToken, this.Default);
+        public ParameterSyntax WithIdentifier(SyntaxToken identifier) => Update(this.AttributeLists, this.Modifiers, this.Type, identifier, this.ExclamationExclamationToken, this.Default);
+        public ParameterSyntax WithExclamationExclamationToken(SyntaxToken exclamationExclamationToken) => Update(this.AttributeLists, this.Modifiers, this.Type, this.Identifier, exclamationExclamationToken, this.Default);
+        public ParameterSyntax WithDefault(EqualsValueClauseSyntax? @default) => Update(this.AttributeLists, this.Modifiers, this.Type, this.Identifier, this.ExclamationExclamationToken, @default);
 
         internal override BaseParameterSyntax AddAttributeListsCore(params AttributeListSyntax[] items) => AddAttributeLists(items);
         public new ParameterSyntax AddAttributeLists(params AttributeListSyntax[] items) => WithAttributeLists(this.AttributeLists.AddRange(items));

src/Compilers/CSharp/Portable/Generated/ErrorFacts.Generated.cs

@@ -253,23 +253,18 @@ public override BoundNode VisitLambda(BoundLambda node)
             var oldInstrumenter = _instrumenter;
             try
             {
-<<<<<<< HEAD
-                _factory.CurrentFunction = node.Symbol;
-                var visited = (BoundLambda)base.VisitLambda(node)!;
+                _factory.CurrentFunction = lambda;
+                if (lambda.IsDirectlyExcludedFromCodeCoverage)
+                {
+                    _instrumenter = RemoveDynamicAnalysisInjectors(oldInstrumenter);
+                }
 
+                var visited = (BoundLambda)base.VisitLambda(node)!;
                 if (RewriteNullChecking(visited.Body) is BoundBlock newBody)
                 {
                     visited = visited.Update(visited.UnboundLambda, visited.Symbol, newBody, visited.Diagnostics, visited.Binder, visited.Type);
                 }
                 return visited;
-=======
-                _factory.CurrentFunction = lambda;
-                if (lambda.IsDirectlyExcludedFromCodeCoverage)
-                {
-                    _instrumenter = RemoveDynamicAnalysisInjectors(oldInstrumenter);
-                }
-                return base.VisitLambda(node)!;
->>>>>>> upstream/main
             }
             finally
             {
@@ -326,15 +321,6 @@ static bool hasReturnTypeOrParameter(LocalFunctionSymbol localFunction, Func<Typ
                     _instrumenter = RemoveDynamicAnalysisInjectors(oldInstrumenter);
                 }
 
-<<<<<<< HEAD
-                var visited = (BoundLocalFunctionStatement)base.VisitLocalFunctionStatement(node)!;
-
-                if (!localFunction.IsIterator && RewriteNullChecking(visited.Body) is BoundBlock newBody)
-                {
-                    visited = visited.Update(localFunction, newBody, null);
-                }
-                return visited;
-=======
                 if (localFunction.IsGenericMethod)
                 {
                     // Each generic local function gets its own dynamic factory because it 
@@ -343,8 +329,13 @@ static bool hasReturnTypeOrParameter(LocalFunctionSymbol localFunction, Func<Typ
                     _dynamicFactory = new LoweredDynamicOperationFactory(_factory, _dynamicFactory.MethodOrdinal, localFunctionOrdinal);
                 }
 
-                return base.VisitLocalFunctionStatement(node)!;
->>>>>>> upstream/main
+                var visited = (BoundLocalFunctionStatement)base.VisitLocalFunctionStatement(node)!;
+
+                if (!localFunction.IsIterator && RewriteNullChecking(visited.Body) is BoundBlock newBody)
+                {
+                    visited = visited.Update(localFunction, newBody, null);
+                }
+                return visited;
             }
             finally
             {

src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter.cs

@@ -1799,11 +1799,7 @@ private MethodSymbol UnsafeGetNullableMethod(SyntaxNode syntax, TypeSymbol nulla
         /// Recommendation: Do not use, use <see cref="TryGetNullableMethod"/> instead! 
         /// If used, a unit-test with a missing member is absolutely a must have.
         /// </summary>
-<<<<<<< HEAD
-        internal static MethodSymbol UnsafeGetNullableMethod(SyntaxNode syntax, TypeSymbol nullableType, SpecialMember member, CSharpCompilation compilation, DiagnosticBag diagnostics)
-=======
         private static MethodSymbol UnsafeGetNullableMethod(SyntaxNode syntax, TypeSymbol nullableType, SpecialMember member, CSharpCompilation compilation, BindingDiagnosticBag diagnostics)
->>>>>>> upstream/main
         {
             var nullableType2 = nullableType as NamedTypeSymbol;
             Debug.Assert(nullableType2 is { });