Tue, 07 Sep 2010 11:50:59 -0400 6982851: Add b107 machine classifications to jprt.properties file.
kamg [Tue, 07 Sep 2010 11:50:59 -0400] rev 6441
6982851: Add b107 machine classifications to jprt.properties file. Summary: See synopsis Reviewed-by: ohair
Tue, 07 Sep 2010 11:38:09 -0400 Merge
kamg [Tue, 07 Sep 2010 11:38:09 -0400] rev 6440
Merge
Fri, 03 Sep 2010 14:47:05 -0400 6870851: Bad frame_chop in StackMapTable crashes JVM
kamg [Fri, 03 Sep 2010 14:47:05 -0400] rev 6439
6870851: Bad frame_chop in StackMapTable crashes JVM Summary: Must check locals for null when processing chop frame Reviewed-by: dholmes, dcubed
Tue, 31 Aug 2010 03:14:00 -0700 6979444: add command line option to print command line flags descriptions
ikrylov [Tue, 31 Aug 2010 03:14:00 -0700] rev 6438
6979444: add command line option to print command line flags descriptions Summary: Implementation of a nonproduct boolean flag XX:PrintFlagsWithComments Reviewed-by: kamg, dholmes, dsamersoff
Wed, 01 Sep 2010 00:40:05 -0700 Merge
never [Wed, 01 Sep 2010 00:40:05 -0700] rev 6437
Merge
Mon, 30 Aug 2010 17:27:35 -0700 6969586: OptimizeStringConcat: SIGSEGV in LoadNode::Value()
never [Mon, 30 Aug 2010 17:27:35 -0700] rev 6436
6969586: OptimizeStringConcat: SIGSEGV in LoadNode::Value() Reviewed-by: kvn
Mon, 30 Aug 2010 11:02:53 -0700 6980978: assert(mt == t->xmeet(this)) failed: meet not commutative
kvn [Mon, 30 Aug 2010 11:02:53 -0700] rev 6435
6980978: assert(mt == t->xmeet(this)) failed: meet not commutative Summary: Fix code in TypeAryPtr::xmeet() for constant array. Reviewed-by: never
Fri, 27 Aug 2010 17:35:08 -0700 Merge
never [Fri, 27 Aug 2010 17:35:08 -0700] rev 6434
Merge
Fri, 27 Aug 2010 17:33:49 -0700 4809552: Optimize Arrays.fill(...)
never [Fri, 27 Aug 2010 17:33:49 -0700] rev 6433
4809552: Optimize Arrays.fill(...) Reviewed-by: kvn
Fri, 27 Aug 2010 01:51:27 -0700 6961697: move nmethod constants section before instruction section
twisti [Fri, 27 Aug 2010 01:51:27 -0700] rev 6432
6961697: move nmethod constants section before instruction section Summary: This is a preparation for 6961690. Reviewed-by: kvn, never
Thu, 26 Aug 2010 11:05:25 -0700 6976400: "Meet Not Symmetric"
kvn [Thu, 26 Aug 2010 11:05:25 -0700] rev 6431
6976400: "Meet Not Symmetric" Summary: Use NULL as klass for TypeAryPtr::RANGE. Add klass verification into TypeAryPtr ctor. Reviewed-by: never
Mon, 30 Aug 2010 10:58:13 -0700 Merge
tonyp [Mon, 30 Aug 2010 10:58:13 -0700] rev 6430
Merge
Mon, 30 Aug 2010 13:00:51 -0400 Merge
tonyp [Mon, 30 Aug 2010 13:00:51 -0400] rev 6429
Merge
Fri, 27 Aug 2010 10:44:06 -0700 Merge
tonyp [Fri, 27 Aug 2010 10:44:06 -0700] rev 6428
Merge
Fri, 27 Aug 2010 13:34:14 -0400 6980206: G1: assert(has_undefined_max_size, "Undefined max size");
tonyp [Fri, 27 Aug 2010 13:34:14 -0400] rev 6427
6980206: G1: assert(has_undefined_max_size, "Undefined max size"); Summary: An assert in the management.cpp is too strong and assumes the max size is always defined on memory pools, even when we don't need to use it. Reviewed-by: mchung, johnc
Fri, 27 Aug 2010 16:57:04 +0100 6980392: TEST_BUG: gc/6581734/Test6581734.java has typo
kevinw [Fri, 27 Aug 2010 16:57:04 +0100] rev 6426
6980392: TEST_BUG: gc/6581734/Test6581734.java has typo Summary: simple correction in testcase Reviewed-by: mchung
Wed, 25 Aug 2010 14:39:55 -0700 6978300: G1: debug builds crash if ParallelGCThreads==0
jcoomes [Wed, 25 Aug 2010 14:39:55 -0700] rev 6425
6978300: G1: debug builds crash if ParallelGCThreads==0 Reviewed-by: tonyp, ysr
Wed, 25 Aug 2010 08:44:58 -0400 6941275: G1: The MemoryPools are incorrectly supported for G1
tonyp [Wed, 25 Aug 2010 08:44:58 -0400] rev 6424
6941275: G1: The MemoryPools are incorrectly supported for G1 Summary: The way we were caluclating the max value meant that it might fluctuate during the run and this broke some assumptions inside the MBeans framework. This change sets the max value of each pool to -1, which means undefined according to the spec. Reviewed-by: mchung, johnc
Mon, 23 Aug 2010 17:51:10 -0700 6910183: CMS: assert(_index < capacity(),"_index out of bounds")
ysr [Mon, 23 Aug 2010 17:51:10 -0700] rev 6423
6910183: CMS: assert(_index < capacity(),"_index out of bounds") Summary: Weakened a too-strong, off-by-one assert; added code to keep track of and report any overflows at appropriate level of verbosity. Reviewed-by: jcoomes, tonyp
Fri, 27 Aug 2010 21:31:15 -0700 Merge
dcubed [Fri, 27 Aug 2010 21:31:15 -0700] rev 6422
Merge
Fri, 27 Aug 2010 15:05:28 -0400 6980262: Memory leak when exception is thrown in static initializer
kamg [Fri, 27 Aug 2010 15:05:28 -0400] rev 6421
6980262: Memory leak when exception is thrown in static initializer Summary: Use resource memory instead of c-heap for the exception message Reviewed-by: phh, jmasa
Wed, 25 Aug 2010 21:29:05 -0400 6978641: Fix for 6929067 introduces additional overhead in thread creation/termination paths
dholmes [Wed, 25 Aug 2010 21:29:05 -0400] rev 6420
6978641: Fix for 6929067 introduces additional overhead in thread creation/termination paths Summary: Disable stack bounds checks in product mode other than for the initial thread Reviewed-by: coleenp, jcoomes, aph
Wed, 25 Aug 2010 10:31:45 -0700 Merge
never [Wed, 25 Aug 2010 10:31:45 -0700] rev 6419
Merge
Wed, 25 Aug 2010 05:27:54 -0700 6978355: renaming for 6961697
twisti [Wed, 25 Aug 2010 05:27:54 -0700] rev 6418
6978355: renaming for 6961697 Summary: This is the renaming part of 6961697 to keep the actual changes small for review. Reviewed-by: kvn, never
Mon, 23 Aug 2010 09:09:36 -0700 6896381: CTW fails share/vm/ci/bcEscapeAnalyzer.cpp:99, assert(_stack_height < _max_stack,"stack overflow")
kvn [Mon, 23 Aug 2010 09:09:36 -0700] rev 6417
6896381: CTW fails share/vm/ci/bcEscapeAnalyzer.cpp:99, assert(_stack_height < _max_stack,"stack overflow") Summary: Check constant Tag type instead of calling get_constant(). Reviewed-by: never
Fri, 20 Aug 2010 23:40:30 -0700 6912064: type profiles need to be exploited more for dynamic language support
jrose [Fri, 20 Aug 2010 23:40:30 -0700] rev 6416
6912064: type profiles need to be exploited more for dynamic language support Reviewed-by: kvn
Mon, 23 Aug 2010 08:44:03 -0700 Merge
dcubed [Mon, 23 Aug 2010 08:44:03 -0700] rev 6415
Merge
Thu, 19 Aug 2010 14:23:59 -0400 6885308: The incorrect -XX:StackRedPages, -XX:StackShadowPages, -XX:StackYellowPages could cause VM crash
ptisnovs [Thu, 19 Aug 2010 14:23:59 -0400] rev 6414
6885308: The incorrect -XX:StackRedPages, -XX:StackShadowPages, -XX:StackYellowPages could cause VM crash Summary: Test minimal stack sizes given (also fixed linux compilation error) Reviewed-by: never, phh, coleenp
Thu, 23 Sep 2010 17:33:27 -0700 Added tag jdk7-b111 for changeset a8fb6372bee7
cl [Thu, 23 Sep 2010 17:33:27 -0700] rev 6413
Added tag jdk7-b111 for changeset a8fb6372bee7
Fri, 24 Sep 2010 16:38:02 -0700 Merge
lana [Fri, 24 Sep 2010 16:38:02 -0700] rev 6412
Merge
Thu, 16 Sep 2010 11:18:21 -0700 Merge
lana [Thu, 16 Sep 2010 11:18:21 -0700] rev 6411
Merge
Tue, 07 Sep 2010 15:51:45 -0700 Merge
ohair [Tue, 07 Sep 2010 15:51:45 -0700] rev 6410
Merge
Thu, 02 Sep 2010 22:07:42 -0700 Merge
lana [Thu, 02 Sep 2010 22:07:42 -0700] rev 6409
Merge
Tue, 24 Aug 2010 13:27:45 +0100 6976186: Integrate Shark
gbenson [Tue, 24 Aug 2010 13:27:45 +0100] rev 6408
6976186: Integrate Shark Summary: Shark is a JIT compiler for Zero that uses the LLVM compiler infrastructure. Reviewed-by: ohair
Thu, 23 Sep 2010 17:33:18 -0700 Added tag jdk7-b111 for changeset fde8c74d7bd1
cl [Thu, 23 Sep 2010 17:33:18 -0700] rev 6407
Added tag jdk7-b111 for changeset fde8c74d7bd1
Wed, 05 Jul 2017 17:22:21 +0200 Added tag jdk7-b111 for changeset 69f3edf08347
duke [Wed, 05 Jul 2017 17:22:21 +0200] rev 6406
Added tag jdk7-b111 for changeset 69f3edf08347
Wed, 05 Jul 2017 17:22:21 +0200 Merge jdk7-b111
duke [Wed, 05 Jul 2017 17:22:21 +0200] rev 6405
Merge
Wed, 05 Jul 2017 17:22:18 +0200 Merge
duke [Wed, 05 Jul 2017 17:22:18 +0200] rev 6404
Merge
Thu, 16 Sep 2010 15:13:23 -0700 Added tag jdk7-b110 for changeset a74f1fdb0bb8
cl [Thu, 16 Sep 2010 15:13:23 -0700] rev 6403
Added tag jdk7-b110 for changeset a74f1fdb0bb8
Wed, 05 Jul 2017 17:22:16 +0200 Merge
duke [Wed, 05 Jul 2017 17:22:16 +0200] rev 6402
Merge
Thu, 16 Sep 2010 15:13:04 -0700 Added tag jdk7-b110 for changeset 763ed87a4ad6
cl [Thu, 16 Sep 2010 15:13:04 -0700] rev 6401
Added tag jdk7-b110 for changeset 763ed87a4ad6
Wed, 05 Jul 2017 17:22:14 +0200 Merge
duke [Wed, 05 Jul 2017 17:22:14 +0200] rev 6400
Merge
Thu, 16 Sep 2010 15:13:03 -0700 Added tag jdk7-b110 for changeset dcabd2849331
cl [Thu, 16 Sep 2010 15:13:03 -0700] rev 6399
Added tag jdk7-b110 for changeset dcabd2849331
Wed, 05 Jul 2017 17:22:12 +0200 Merge
duke [Wed, 05 Jul 2017 17:22:12 +0200] rev 6398
Merge
Thu, 16 Sep 2010 15:12:53 -0700 Added tag jdk7-b110 for changeset 50870108a9a4
cl [Thu, 16 Sep 2010 15:12:53 -0700] rev 6397
Added tag jdk7-b110 for changeset 50870108a9a4
Wed, 05 Jul 2017 17:22:10 +0200 Merge
duke [Wed, 05 Jul 2017 17:22:10 +0200] rev 6396
Merge
Thu, 16 Sep 2010 15:13:11 -0700 Added tag jdk7-b110 for changeset 5c7242a0a4a5
cl [Thu, 16 Sep 2010 15:13:11 -0700] rev 6395
Added tag jdk7-b110 for changeset 5c7242a0a4a5
Wed, 05 Jul 2017 17:22:07 +0200 Merge
duke [Wed, 05 Jul 2017 17:22:07 +0200] rev 6394
Merge
Thu, 16 Sep 2010 15:12:57 -0700 Added tag jdk7-b110 for changeset 184ac472c680
cl [Thu, 16 Sep 2010 15:12:57 -0700] rev 6393
Added tag jdk7-b110 for changeset 184ac472c680
Thu, 16 Sep 2010 15:12:48 -0700 Added tag jdk7-b110 for changeset 65cdbb9664e3
cl [Thu, 16 Sep 2010 15:12:48 -0700] rev 6392
Added tag jdk7-b110 for changeset 65cdbb9664e3
Wed, 05 Jul 2017 17:21:59 +0200 Added tag jdk7-b110 for changeset a6442d6bc38a
duke [Wed, 05 Jul 2017 17:21:59 +0200] rev 6391
Added tag jdk7-b110 for changeset a6442d6bc38a
Wed, 05 Jul 2017 17:21:58 +0200 Merge jdk7-b110
duke [Wed, 05 Jul 2017 17:21:58 +0200] rev 6390
Merge
Wed, 05 Jul 2017 17:21:56 +0200 Merge
duke [Wed, 05 Jul 2017 17:21:56 +0200] rev 6389
Merge
Wed, 15 Sep 2010 13:41:14 -0700 Merge
cl [Wed, 15 Sep 2010 13:41:14 -0700] rev 6388
Merge
Thu, 09 Sep 2010 16:29:40 -0700 6982137: Rebranding pass 2 - missed copyright changes
ohair [Thu, 09 Sep 2010 16:29:40 -0700] rev 6387
6982137: Rebranding pass 2 - missed copyright changes Reviewed-by: mbykov
Thu, 09 Sep 2010 15:08:03 -0700 Added tag jdk7-b109 for changeset e14215cd81b9
cl [Thu, 09 Sep 2010 15:08:03 -0700] rev 6386
Added tag jdk7-b109 for changeset e14215cd81b9
Wed, 05 Jul 2017 17:21:53 +0200 Merge
duke [Wed, 05 Jul 2017 17:21:53 +0200] rev 6385
Merge
Thu, 09 Sep 2010 15:07:44 -0700 Added tag jdk7-b109 for changeset 156995b5d710
cl [Thu, 09 Sep 2010 15:07:44 -0700] rev 6384
Added tag jdk7-b109 for changeset 156995b5d710
Wed, 05 Jul 2017 17:21:50 +0200 Merge
duke [Wed, 05 Jul 2017 17:21:50 +0200] rev 6383
Merge
Thu, 09 Sep 2010 15:07:43 -0700 Added tag jdk7-b109 for changeset 6ae478428a17
cl [Thu, 09 Sep 2010 15:07:43 -0700] rev 6382
Added tag jdk7-b109 for changeset 6ae478428a17
Wed, 05 Jul 2017 17:21:48 +0200 Merge
duke [Wed, 05 Jul 2017 17:21:48 +0200] rev 6381
Merge
Thu, 09 Sep 2010 15:07:32 -0700 Added tag jdk7-b109 for changeset 7e79ddd7faee
cl [Thu, 09 Sep 2010 15:07:32 -0700] rev 6380
Added tag jdk7-b109 for changeset 7e79ddd7faee
Wed, 05 Jul 2017 17:21:45 +0200 Merge
duke [Wed, 05 Jul 2017 17:21:45 +0200] rev 6379
Merge
Mon, 13 Sep 2010 13:10:26 -0400 6983225: libjvm_db.so is not imported into solaris-x86 builds, and libjvm_dtrace.so not imported at all.
kamg [Mon, 13 Sep 2010 13:10:26 -0400] rev 6378
6983225: libjvm_db.so is not imported into solaris-x86 builds, and libjvm_dtrace.so not imported at all. Summary: Removed sparc-only libjvm_db code and added rules for libjvm_dtrace Reviewed-by: ohair
Mon, 13 Sep 2010 02:54:35 -0700 Merge
yhuang [Mon, 13 Sep 2010 02:54:35 -0700] rev 6377
Merge
Thu, 09 Sep 2010 23:30:59 -0700 Merge
yhuang [Thu, 09 Sep 2010 23:30:59 -0700] rev 6376
Merge
Thu, 09 Sep 2010 23:01:43 -0700 6980510: Fix for 6959252 broke JConsole mnemonic keys
yhuang [Thu, 09 Sep 2010 23:01:43 -0700] rev 6375
6980510: Fix for 6959252 broke JConsole mnemonic keys Reviewed-by: mfang, yhuang
Thu, 09 Sep 2010 16:26:46 -0700 6982137: Rebranding pass 2 - missed copyright changes
ohair [Thu, 09 Sep 2010 16:26:46 -0700] rev 6374
6982137: Rebranding pass 2 - missed copyright changes Reviewed-by: mbykov
Wed, 08 Sep 2010 15:12:37 -0700 6974017: Upgrade required Solaris Studio compilers to 5.10 (12 update 1 + patches)
ohair [Wed, 08 Sep 2010 15:12:37 -0700] rev 6373
6974017: Upgrade required Solaris Studio compilers to 5.10 (12 update 1 + patches) Reviewed-by: jcoomes
Thu, 09 Sep 2010 15:07:51 -0700 Added tag jdk7-b109 for changeset f2f25ed74ff7
cl [Thu, 09 Sep 2010 15:07:51 -0700] rev 6372
Added tag jdk7-b109 for changeset f2f25ed74ff7
Wed, 05 Jul 2017 17:21:41 +0200 Merge
duke [Wed, 05 Jul 2017 17:21:41 +0200] rev 6371
Merge
Thu, 09 Sep 2010 15:07:37 -0700 Added tag jdk7-b109 for changeset 59327a28f6c0
cl [Thu, 09 Sep 2010 15:07:37 -0700] rev 6370
Added tag jdk7-b109 for changeset 59327a28f6c0
Wed, 15 Sep 2010 13:40:23 -0700 Merge
cl [Wed, 15 Sep 2010 13:40:23 -0700] rev 6369
Merge
Thu, 09 Sep 2010 17:08:42 -0700 6982137: Rebranding pass 2 - missed copyright changes
ohair [Thu, 09 Sep 2010 17:08:42 -0700] rev 6368
6982137: Rebranding pass 2 - missed copyright changes Reviewed-by: mbykov
Wed, 08 Sep 2010 17:29:34 -0700 Merge
cl [Wed, 08 Sep 2010 17:29:34 -0700] rev 6367
Merge
Wed, 08 Sep 2010 15:13:31 -0700 6974017: Upgrade required Solaris Studio compilers to 5.10 (12 update 1 + patches)
ohair [Wed, 08 Sep 2010 15:13:31 -0700] rev 6366
6974017: Upgrade required Solaris Studio compilers to 5.10 (12 update 1 + patches) Reviewed-by: jcoomes
Thu, 09 Sep 2010 15:07:31 -0700 Added tag jdk7-b109 for changeset bca3b1e3474c
cl [Thu, 09 Sep 2010 15:07:31 -0700] rev 6365
Added tag jdk7-b109 for changeset bca3b1e3474c
Wed, 05 Jul 2017 17:21:33 +0200 Added tag jdk7-b109 for changeset e02b4d709e17
duke [Wed, 05 Jul 2017 17:21:33 +0200] rev 6364
Added tag jdk7-b109 for changeset e02b4d709e17
Wed, 05 Jul 2017 17:21:32 +0200 Merge jdk7-b109
duke [Wed, 05 Jul 2017 17:21:32 +0200] rev 6363
Merge
Wed, 05 Jul 2017 17:21:29 +0200 Merge
duke [Wed, 05 Jul 2017 17:21:29 +0200] rev 6362
Merge
Thu, 09 Sep 2010 13:49:03 -0700 Merge
cl [Thu, 09 Sep 2010 13:49:03 -0700] rev 6361
Merge
Fri, 03 Sep 2010 12:50:19 -0700 Added tag jdk7-b108 for changeset 44d515c5b5b6
cl [Fri, 03 Sep 2010 12:50:19 -0700] rev 6360
Added tag jdk7-b108 for changeset 44d515c5b5b6
Tue, 07 Sep 2010 15:14:49 -0700 6982946: Change make/jprt.properties to defer to JPRT itself for jdk platform list
ohair [Tue, 07 Sep 2010 15:14:49 -0700] rev 6359
6982946: Change make/jprt.properties to defer to JPRT itself for jdk platform list Reviewed-by: kamg
Sun, 29 Aug 2010 22:42:08 -0700 Merge
lana [Sun, 29 Aug 2010 22:42:08 -0700] rev 6358
Merge
Mon, 23 Aug 2010 19:14:55 -0700 Merge
lana [Mon, 23 Aug 2010 19:14:55 -0700] rev 6357
Merge
Mon, 23 Aug 2010 15:13:33 -0700 6976747: JCDiagnostic: replace "boolean mandatory" with new "Set<JCDiagnostic.Flag>"
jjg [Mon, 23 Aug 2010 15:13:33 -0700] rev 6356
6976747: JCDiagnostic: replace "boolean mandatory" with new "Set<JCDiagnostic.Flag>" Reviewed-by: mcimadamore
Mon, 23 Aug 2010 11:56:53 -0700 6975005: improve JavacProcessingEnvironment.Round abstraction
jjg [Mon, 23 Aug 2010 11:56:53 -0700] rev 6355
6975005: improve JavacProcessingEnvironment.Round abstraction Reviewed-by: darcy
Mon, 23 Aug 2010 17:00:07 +0100 6978574: return statement in try block with multi-catch causes ClassFormatError
mcimadamore [Mon, 23 Aug 2010 17:00:07 +0100] rev 6354
6978574: return statement in try block with multi-catch causes ClassFormatError Summary: Wrong nested loops in Gen.java causes javac to generate bad bytecode Reviewed-by: jjg
Mon, 23 Aug 2010 16:59:30 +0100 6932571: Compiling Generics causing Inconvertible types
mcimadamore [Mon, 23 Aug 2010 16:59:30 +0100] rev 6353
6932571: Compiling Generics causing Inconvertible types Summary: Types.rewriteQuantifiers() does not work well with recursive type-variable bounds Reviewed-by: jjg
Thu, 19 Aug 2010 11:54:25 +0100 6977800: Regression: invalid resolution of supertype for local class
mcimadamore [Thu, 19 Aug 2010 11:54:25 +0100] rev 6352
6977800: Regression: invalid resolution of supertype for local class Summary: resolution of superclass/superinterfaces in extends/implements clause skips local classes Reviewed-by: jjg
Thu, 19 Aug 2010 11:52:58 +0100 6885255: Improve usability of raw warnings
mcimadamore [Thu, 19 Aug 2010 11:52:58 +0100] rev 6351
6885255: Improve usability of raw warnings Summary: raw warnings should be disabled in (i) instanceof expressions and (ii) when java.lang.Class is not parameterized Reviewed-by: jjg
Thu, 19 Aug 2010 11:50:50 +0100 6886247: regression: javac crashes with an assertion error in Attr.java
mcimadamore [Thu, 19 Aug 2010 11:50:50 +0100] rev 6350
6886247: regression: javac crashes with an assertion error in Attr.java Summary: capture conversion does not work on nested types Reviewed-by: jjg
Mon, 16 Aug 2010 14:59:21 -0700 6976833: options included twice in Example SimpleCompiler
jjg [Mon, 16 Aug 2010 14:59:21 -0700] rev 6349
6976833: options included twice in Example SimpleCompiler Reviewed-by: darcy
Mon, 16 Aug 2010 14:58:10 +0100 6369605: Unconstrained type variables fails to include bounds
mcimadamore [Mon, 16 Aug 2010 14:58:10 +0100] rev 6348
6369605: Unconstrained type variables fails to include bounds Summary: unconstrained type-variables with recursive bounds are not inferred properly Reviewed-by: jjg
Mon, 16 Aug 2010 14:56:23 +0100 6976649: javac does not enforce required annotation elements in arrays
mcimadamore [Mon, 16 Aug 2010 14:56:23 +0100] rev 6347
6976649: javac does not enforce required annotation elements in arrays Summary: type annotation should take advantage of recursive annotation checking Reviewed-by: jjg
Thu, 12 Aug 2010 19:59:10 -0700 Merge
lana [Thu, 12 Aug 2010 19:59:10 -0700] rev 6346
Merge
(0) -3000 -1000 -300 -100 -96 +96 +100 +300 +1000 +3000 +10000 +30000 tip