fix quotation of readonly fields

fixes #514 closes #622
dotnet · Sep 8, 2015 · a2d2990 · a2d2990
1 parent 751f0b7
commit a2d2990
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/src/fsharp/QuotationTranslator.fs b/src/fsharp/QuotationTranslator.fs
@@ -444,6 +444,7 @@ and private ConvExprCore cenv (env : QuotationTranslationEnv) (expr: Expr) : QP.
             QP.mkTupleGet(tyR, n, ConvExpr cenv env e)
 
         | TOp.ILAsm(([ I_ldfld(_,_,fspec) ] 
+                    | [ I_ldfld(_,_,fspec); AI_nop ]
                     | [ I_ldsfld (_,fspec) ] 
                     | [ I_ldsfld (_,fspec); AI_nop ]),_),enclTypeArgs,args  -> 
             ConvLdfld  cenv env m fspec enclTypeArgs args

diff --git a/tests/fsharp/core/quotes/cslib.cs b/tests/fsharp/core/quotes/cslib.cs
@@ -2,3 +2,10 @@
 public struct S {
     public int x;
 }
+
+public class Class1
+{
+    public string myField;
+    public readonly string myReadonlyField;
+    public Class1(string v) { this.myReadonlyField = v; }
+}
diff --git a/tests/fsharp/core/quotes/test.fsx b/tests/fsharp/core/quotes/test.fsx
@@ -528,6 +528,14 @@ module TypedTest = begin
             |   _ -> false
         end
 
+    test "check accesses to readonly fields in ReflectedDefinitions" 
+        begin
+            let c1 = Class1("a")
+            match <@ c1.myReadonlyField @> with
+            |   FieldGet(Some (ValueWithName (_, v, "c1")), field) -> (v.Name = "Class1") && (field.Name = "myReadonlyField")
+            |   _ -> false
+        end
+
 end
 
 (*