diff --git a/compiler/frontend/builtins/jet/.kotlin_class_names b/compiler/frontend/builtins/jet/.kotlin_class_names index 19121b1e97e..217d719bc65 100644 Binary files a/compiler/frontend/builtins/jet/.kotlin_class_names and b/compiler/frontend/builtins/jet/.kotlin_class_names differ diff --git a/compiler/frontend/builtins/jet/.kotlin_name_table b/compiler/frontend/builtins/jet/.kotlin_name_table index 964f216fcde..4e391c72de6 100644 Binary files a/compiler/frontend/builtins/jet/.kotlin_name_table and b/compiler/frontend/builtins/jet/.kotlin_name_table differ diff --git a/compiler/frontend/builtins/jet/.kotlin_package b/compiler/frontend/builtins/jet/.kotlin_package index 105adc87a8d..1780444e4bd 100644 Binary files a/compiler/frontend/builtins/jet/.kotlin_package and b/compiler/frontend/builtins/jet/.kotlin_package differ diff --git a/compiler/frontend/builtins/jet/suppress.kotlin_class b/compiler/frontend/builtins/jet/suppress.kotlin_class new file mode 100644 index 00000000000..ecd25f55118 Binary files /dev/null and b/compiler/frontend/builtins/jet/suppress.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/volatile.kotlin_class b/compiler/frontend/builtins/jet/volatile.kotlin_class index a4347382bdb..64bb1765467 100644 --- a/compiler/frontend/builtins/jet/volatile.kotlin_class +++ b/compiler/frontend/builtins/jet/volatile.kotlin_class @@ -1,3 +1,3 @@ - 2 + 2 |R 0B - \ No newline at end of file + \ No newline at end of file diff --git a/compiler/testData/builtin-classes.txt b/compiler/testData/builtin-classes.txt index d06a3f528ac..dc8a32ba4a3 100644 --- a/compiler/testData/builtin-classes.txt +++ b/compiler/testData/builtin-classes.txt @@ -1602,6 +1602,10 @@ public final annotation class deprecated : jet.Annotation { /*primary*/ public constructor deprecated(/*0*/ value: jet.String) } +public final annotation class suppress : jet.Annotation { + /*primary*/ public constructor suppress(/*0*/ vararg names: jet.String /*jet.Array*/) +} + public final annotation class volatile : jet.Annotation { /*primary*/ public constructor volatile() } diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java b/core/descriptors/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java index 646cfc6eb78..72e6653b08c 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java @@ -373,6 +373,11 @@ public class KotlinBuiltIns { return getBuiltInClassByName("data"); } + @NotNull + public ClassDescriptor getSuppressAnnotationClass() { + return getBuiltInClassByName("suppress"); + } + @NotNull public ClassDescriptor getVolatileAnnotationClass() { return getBuiltInClassByName("volatile"); diff --git a/idea/builtinsSrc/jet/Library.jet b/idea/builtinsSrc/jet/Library.jet index ab4e2c39222..fe19c3f8db0 100644 --- a/idea/builtinsSrc/jet/Library.jet +++ b/idea/builtinsSrc/jet/Library.jet @@ -6,6 +6,7 @@ public annotation class volatile : Annotation public annotation class atomic : Annotation public annotation class data : Annotation public annotation class deprecated(value: String) : Annotation +public annotation class suppress(vararg names: String) public fun synchronized(lock: Any, block : () -> R) : R