Merge remote-tracking branch 'origin/master' into incremental

2014-06-19 11:43:11 +04:00
parent f6129732a2 209315baad
commit aa41ae09ed
89 changed files with 1305 additions and 808 deletions
@@ -0,0 +1,10 @@
+volatile var vol = 1
+transient val tra = 1
+
+strictfp fun str() {}
+synchronized fun sync() {}
+
+// 0 kotlin/jvm/volatile
+// 0 kotlin/jvm/transient
+// 0 kotlin/jvm/strictfp
+// 0 kotlin/jvm/synchronized
@@ -1,3 +0,0 @@
-volatile val foo: Int = 1
-
-// 0 kotlin/volatile