Merge

4 files changed, 10 insertions, 7 deletions

diff --git a/BCT/BytecodeTranslator/ExpressionTraverser.cs b/BCT/BytecodeTranslator/ExpressionTraverser.cs
index f2f0dde5..caa2c351 100644
--- a/BCT/BytecodeTranslator/ExpressionTraverser.cs
+++ b/BCT/BytecodeTranslator/ExpressionTraverser.cs
@@ -961,8 +961,10 @@ namespace BytecodeTranslator
       Bpl.IToken cloc = creationAST.Token();

       var a = this.sink.CreateFreshLocal(creationAST.Type);

 

-      sink.AddDelegate(type.ResolvedType, methodToCall.ResolvedMethod);

-      Bpl.Constant constant = sink.FindOrCreateDelegateMethodConstant(methodToCall.ResolvedMethod);

+      ITypeDefinition unspecializedType = Microsoft.Cci.MutableContracts.ContractHelper.Unspecialized(type.ResolvedType).ResolvedType;

+      IMethodDefinition unspecializedMethod = Sink.Unspecialize(methodToCall.ResolvedMethod).ResolvedMethod;

+      sink.AddDelegate(unspecializedType, unspecializedMethod);

+      Bpl.Constant constant = sink.FindOrCreateDelegateMethodConstant(unspecializedMethod);

       Bpl.Expr methodExpr = Bpl.Expr.Ident(constant);

       Bpl.Expr instanceExpr = TranslatedExpressions.Pop();

 

diff --git a/BCT/BytecodeTranslator/MetadataTraverser.cs b/BCT/BytecodeTranslator/MetadataTraverser.cs
index 30def4a2..73f76d52 100644
--- a/BCT/BytecodeTranslator/MetadataTraverser.cs
+++ b/BCT/BytecodeTranslator/MetadataTraverser.cs
@@ -83,7 +83,8 @@ namespace BytecodeTranslator {
         }

         this.sawCctor = savedSawCctor;

       } else if (typeDefinition.IsDelegate) {

-        sink.AddDelegateType(typeDefinition);

+        ITypeDefinition unspecializedType = Microsoft.Cci.MutableContracts.ContractHelper.Unspecialized(typeDefinition).ResolvedType;

+        sink.AddDelegateType(unspecializedType);

       } else if (typeDefinition.IsInterface) {

         sink.FindOrCreateType(typeDefinition);

         base.Visit(typeDefinition);

diff --git a/BCT/BytecodeTranslator/Program.cs b/BCT/BytecodeTranslator/Program.cs
index abb9a2c2..c138b28a 100644
--- a/BCT/BytecodeTranslator/Program.cs
+++ b/BCT/BytecodeTranslator/Program.cs
@@ -335,7 +335,6 @@ namespace BytecodeTranslator {
         foreach (IMethodDefinition def in PhoneNavigationCodeTraverser.NavCallers) {

           PhoneCodeHelper.addHandlerStubCaller(sink, def);

         }

-

         PhoneCodeHelper.instance().createQueriesBatchFile(sink, outputFileName);

       }

 

@@ -393,8 +392,9 @@ namespace BytecodeTranslator {
       }

 

       try {

-        IMethodDefinition unspecializedInvokeMethod = Sink.Unspecialize(invokeMethod).ResolvedMethod;

-        var decl = sink.FindOrCreateProcedure(unspecializedInvokeMethod).Decl;

+        // IMethodDefinition unspecializedInvokeMethod = Sink.Unspecialize(invokeMethod).ResolvedMethod;

+        // var decl = sink.FindOrCreateProcedure(unspecializedInvokeMethod).Decl;

+        var decl = sink.FindOrCreateProcedure(invokeMethod).Decl;

         var proc = decl as Bpl.Procedure;

         var invars = proc.InParams;

         var outvars = proc.OutParams;

diff --git a/BCT/BytecodeTranslator/Sink.cs b/BCT/BytecodeTranslator/Sink.cs
index fc98bb9f..1427b836 100644
--- a/BCT/BytecodeTranslator/Sink.cs
+++ b/BCT/BytecodeTranslator/Sink.cs
@@ -431,7 +431,7 @@ namespace BytecodeTranslator {
         string MethodName = TranslationHelper.CreateUniqueMethodName(method);

         // The method can be generic (or have a parameter whose type is a type parameter of the method's

         // containing class) and then there can be name clashes.

-        //MethodName += key.ToString();

+        MethodName += key.ToString();

 

         if (this.initiallyDeclaredProcedures.TryGetValue(MethodName, out procInfo)) return procInfo;