mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 4.4.0.122

Browse Source 
Former-commit-id: a99f46acaeba3ab496c7afc02c29b839e30a0d0b
This commit is contained in:
Xamarin Public Jenkins
2016-04-12 13:19:31 -04:00
parent a632333cc7
commit d444f0caa4
118 changed files with 4121 additions and 1632 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mcs/mcs/constant.cs
View File

@@ -2245,7 +2245,7 @@ namespace Mono.CSharp {
return IsLeftResolvedExpressionValid (dmb.Arguments [0].Expr);
}
if (expr is ConstantExpr || expr is TypeExpr || expr is NamespaceExpression || expr is This)
if (expr is ConstantExpr || expr is TypeExpr || expr is NamespaceExpression || expr is VariableReference)
return true;
return false;

2
mcs/mcs/property.cs
View File

@@ -901,7 +901,7 @@ namespace Mono.CSharp
public override void Emit ()
{
if ((AccessorFirst.ModFlags & (Modifiers.STATIC | Modifiers.COMPILER_GENERATED)) == Modifiers.COMPILER_GENERATED && Parent.PartialContainer.HasExplicitLayout) {
if ((AccessorFirst.ModFlags & (Modifiers.STATIC | Modifiers.AutoProperty)) == Modifiers.AutoProperty && Parent.PartialContainer.HasExplicitLayout) {
Report.Error (842, Location,
"Automatically implemented property `{0}' cannot be used inside a type with an explicit StructLayout attribute",
GetSignatureForError ());

22
mcs/mcs/settings.cs
View File

@@ -1211,13 +1211,29 @@ namespace Mono.CSharp {
return ParseResult.Success;
// csc options that we don't support
case "/utf8output":
case "/subsystemversion":
case "/analyzer":
case "/appconfig":
case "/baseaddress":
case "/deterministic":
case "/errorendlocation":
case "/errorlog":
case "/features":
case "/highentropyva":
case "/highentropyva+":
case "/highentropyva-":
case "/win32manifest":
case "/link":
case "/moduleassemblyname":
case "/nowin32manifest":
case "/pathmap":
case "/pdb":
case "/preferreduilang":
case "/publicsign":
case "/reportanalyzer":
case "/ruleset":
case "/sqmsessionguid":
case "/subsystemversion":
case "/utf8output":
case "/win32manifest":
return ParseResult.Success;
default: