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

Imported Upstream version 4.8.0.309

Browse Source 
Former-commit-id: 5f9c6ae75f295e057a7d2971f3a6df4656fa8850
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-11-10 13:04:39 +00:00
parent ee1447783b
commit 94b2861243
4912 changed files with 390737 additions and 49310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mcs/class/Mono.CodeContracts/Makefile
View File

@@ -5,7 +5,7 @@ include ../../build/rules.make
LIBRARY = Mono.CodeContracts.dll
LIB_REFS = System System.Core Mono.Cecil Mono.Cecil.Mdb
LIB_MCS_FLAGS =
LIB_MCS_FLAGS = -nowarn:618
TEST_MCS_FLAGS =
TEST_LIB_REFS = System.Core

6
mcs/class/Mono.CodeContracts/Mono.CodeContracts.Rewrite.AstVisitors/CompileVisitor.cs
View File

@@ -57,9 +57,9 @@ namespace Mono.CodeContracts.Rewrite.AstVisitors {
Instruction originalInst;
if (this.instructionLookup != null) {
// TODO: Doesn't handle inherited contracts - need to check what to do in this case.
if (this.instructionLookup.TryGetValue (originalExpr, out originalInst)) {
inst.SequencePoint = originalInst.SequencePoint;
}
//if (this.instructionLookup.TryGetValue (originalExpr, out originalInst)) {
// inst.SequencePoint = originalInst.SequencePoint;
//}
}
this.fnEmit (inst);
}

3
mcs/class/Mono.CodeContracts/Mono.CodeContracts.Rewrite.AstVisitors/SourcePositionVisitor.cs
View File

@@ -96,6 +96,7 @@ namespace Mono.CodeContracts.Rewrite.AstVisitors {
public override Expr Visit (Expr e)
{
/*
Instruction inst;
if (this.instructionLookup.TryGetValue (e, out inst)) {
var seq = inst.SequencePoint;
@@ -111,6 +112,8 @@ namespace Mono.CodeContracts.Rewrite.AstVisitors {
}
}
}
*/
return base.Visit (e);
}

2
mcs/class/Mono.CodeContracts/Mono.CodeContracts.Rewrite/ContractsRuntime.cs
View File

@@ -204,7 +204,7 @@ namespace Mono.CodeContracts.Rewrite {
method.Parameters.Add (new ParameterDefinition ("message", ParameterAttributes.None, typeString));
method.Parameters.Add (new ParameterDefinition ("conditionText", ParameterAttributes.None, typeString));
method.Parameters.Add (new ParameterDefinition ("inner", ParameterAttributes.None, typeException));
VariableDefinition vMsg = new VariableDefinition ("sMsg", typeString);
VariableDefinition vMsg = new VariableDefinition (typeString);
method.Body.Variables.Add (vMsg);
method.Body.InitLocals = true;
var il = method.Body.GetILProcessor ();

2
mcs/class/Mono.CodeContracts/Mono.CodeContracts.Static.AST/TypeNode.cs
View File

@@ -60,7 +60,7 @@ namespace Mono.CodeContracts.Static.AST {
{
if (TypeDefinition == null)
return null;
return TypeDefinition.Interfaces.Select (i => new TypeNode (i));
return TypeDefinition.Interfaces.Select (i => new TypeNode (i.InterfaceType));
}
}

4
mcs/class/Mono.CodeContracts/Test/TestCCRewrite.cs
View File

@@ -324,7 +324,9 @@ namespace MonoTests.Mono.CodeContracts {
{
const string PreFail = "Precondition failed";
this.ral.Call (fnGood);
this.CheckException (fnBad, PreFail, condition);
// FIXME:
// this.CheckException (fnBad, PreFail, condition);
}
[Test]