Merge pull request dotnet/coreclr#5821 from kyulee1/fixwb

ARM64: Fix WriteBarrier Commit migrated from dotnet/coreclr@9c50443
picenka21 · Jun 16, 2016 · 43a2f90 · 43a2f90
2 parents ec77383 + bf1d960
commit 43a2f90
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/coreclr/src/vm/arm64/asmhelpers.asm b/src/coreclr/src/vm/arm64/asmhelpers.asm
@@ -303,7 +303,7 @@ NotInHeap
 ;
     WRITE_BARRIER_ENTRY JIT_WriteBarrier
         dmb      ST
-        str      x15, [x14], 8
+        str      x15, [x14]
 
         ; Branch to Exit if the reference is not in the Gen0 heap
         ;
@@ -332,6 +332,7 @@ UpdateCardTable
         mov      x12, 0xFF 
         strb     w12, [x15]
 Exit
+        add      x14, x14, 8
         ret      lr          
     WRITE_BARRIER_END JIT_WriteBarrier
 

diff --git a/src/coreclr/tests/arm64/Tests.lst b/src/coreclr/tests/arm64/Tests.lst
@@ -2412,7 +2412,7 @@ RelativePath=baseservices\threading\interlocked\compareexchange\CompareExchangeT
 WorkingDir=baseservices\threading\interlocked\compareexchange\CompareExchangeTClass
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_FAIL;UNSTABLE
+Categories=NEW;EXPECTED_PASS
 HostStyle=0
 [CompareExchangeTClass_1.cmd_345]
 RelativePath=baseservices\threading\interlocked\compareexchange\CompareExchangeTClass_1\CompareExchangeTClass_1.cmd
@@ -20850,14 +20850,14 @@ RelativePath=GC\Scenarios\BinTree\thdtreegrowingobj\thdtreegrowingobj.cmd
 WorkingDir=GC\Scenarios\BinTree\thdtreegrowingobj
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_FAIL;UNSTABLE
+Categories=NEW;EXPECTED_PASS
 HostStyle=0
 [thdtreelivingobj.cmd_2992]
 RelativePath=GC\Scenarios\BinTree\thdtreelivingobj\thdtreelivingobj.cmd
 WorkingDir=GC\Scenarios\BinTree\thdtreelivingobj
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_FAIL
+Categories=NEW;EXPECTED_PASS
 HostStyle=0
 [arrcpy.cmd_2993]
 RelativePath=GC\Scenarios\Boxing\arrcpy\arrcpy.cmd