Mon, 21 Jun 2010 11:00:15 -0700 6960853: Cleanup makefiles, remove unused vars etc.
ohair [Mon, 21 Jun 2010 11:00:15 -0700] rev 5743
6960853: Cleanup makefiles, remove unused vars etc. 6959596: Windows fastdebug build broken 6960335: Add top level 'make test' rule that uses test/Makefile, runs all test batches Reviewed-by: alanb
Thu, 24 Jun 2010 20:02:55 -0700 Added tag jdk7-b99 for changeset 3aeed58228be
mikejwre [Thu, 24 Jun 2010 20:02:55 -0700] rev 5742
Added tag jdk7-b99 for changeset 3aeed58228be
Wed, 05 Jul 2017 17:16:17 +0200 Added tag jdk7-b99 for changeset c4c8a5bc54f6
duke [Wed, 05 Jul 2017 17:16:17 +0200] rev 5741
Added tag jdk7-b99 for changeset c4c8a5bc54f6
Wed, 05 Jul 2017 17:16:17 +0200 Merge jdk7-b99
duke [Wed, 05 Jul 2017 17:16:17 +0200] rev 5740
Merge
Wed, 05 Jul 2017 17:16:14 +0200 Merge
duke [Wed, 05 Jul 2017 17:16:14 +0200] rev 5739
Merge
Fri, 18 Jun 2010 15:12:04 -0700 Merge
jrose [Fri, 18 Jun 2010 15:12:04 -0700] rev 5738
Merge
Thu, 13 May 2010 20:01:40 -0700 Merge
jrose [Thu, 13 May 2010 20:01:40 -0700] rev 5737
Merge
Sat, 01 May 2010 15:05:39 -0700 6939134: JSR 292 adjustments to method handle invocation
jrose [Sat, 01 May 2010 15:05:39 -0700] rev 5736
6939134: JSR 292 adjustments to method handle invocation Summary: split MethodHandle.invoke into invokeExact and invokeGeneric Reviewed-by: twisti
Thu, 17 Jun 2010 16:28:21 -0700 Added tag jdk7-b98 for changeset eca02d17ce03
mikejwre [Thu, 17 Jun 2010 16:28:21 -0700] rev 5735
Added tag jdk7-b98 for changeset eca02d17ce03
Wed, 05 Jul 2017 17:16:10 +0200 Merge
duke [Wed, 05 Jul 2017 17:16:10 +0200] rev 5734
Merge
Thu, 17 Jun 2010 16:28:05 -0700 Added tag jdk7-b98 for changeset 2166b8232399
mikejwre [Thu, 17 Jun 2010 16:28:05 -0700] rev 5733
Added tag jdk7-b98 for changeset 2166b8232399
Wed, 05 Jul 2017 17:16:07 +0200 Merge
duke [Wed, 05 Jul 2017 17:16:07 +0200] rev 5732
Merge
Thu, 17 Jun 2010 16:28:04 -0700 Added tag jdk7-b98 for changeset 19fe6cf1559b
mikejwre [Thu, 17 Jun 2010 16:28:04 -0700] rev 5731
Added tag jdk7-b98 for changeset 19fe6cf1559b
Wed, 05 Jul 2017 17:16:05 +0200 Merge
duke [Wed, 05 Jul 2017 17:16:05 +0200] rev 5730
Merge
Thu, 17 Jun 2010 16:27:56 -0700 Added tag jdk7-b98 for changeset 7b1eebf9ecf0
mikejwre [Thu, 17 Jun 2010 16:27:56 -0700] rev 5729
Added tag jdk7-b98 for changeset 7b1eebf9ecf0
Wed, 05 Jul 2017 17:16:02 +0200 Merge
duke [Wed, 05 Jul 2017 17:16:02 +0200] rev 5728
Merge
Sat, 19 Jun 2010 01:14:40 -0700 Merge
jrose [Sat, 19 Jun 2010 01:14:40 -0700] rev 5727
Merge
Tue, 08 Jun 2010 23:08:56 -0700 6939203: JSR 292 needs method handle constants
jrose [Tue, 08 Jun 2010 23:08:56 -0700] rev 5726
6939203: JSR 292 needs method handle constants Summary: Add new CP types CONSTANT_MethodHandle, CONSTANT_MethodType to verifier; put in runtime support upcall. Reviewed-by: twisti
Fri, 18 Jun 2010 15:23:57 -0700 Merge
jrose [Fri, 18 Jun 2010 15:23:57 -0700] rev 5725
Merge
Thu, 13 May 2010 20:01:34 -0700 Merge
jrose [Thu, 13 May 2010 20:01:34 -0700] rev 5724
Merge
Mon, 03 May 2010 23:32:47 -0700 6939196: method handle signatures off the boot class path get linkage errors
jrose [Mon, 03 May 2010 23:32:47 -0700] rev 5723
6939196: method handle signatures off the boot class path get linkage errors Summary: Remove workaround from MethodHandleImpl lookup code; add JUnit regression test to MethodHandlesTest. Reviewed-by: twisti
Fri, 30 Apr 2010 23:48:23 -0700 6939134: JSR 292 adjustments to method handle invocation
jrose [Fri, 30 Apr 2010 23:48:23 -0700] rev 5722
6939134: JSR 292 adjustments to method handle invocation Summary: split MethodHandle.invoke into invokeExact and invokeGeneric; also clean up JVM-to-Java interfaces Reviewed-by: twisti
Thu, 17 Jun 2010 16:28:11 -0700 Added tag jdk7-b98 for changeset 3046e368377b
mikejwre [Thu, 17 Jun 2010 16:28:11 -0700] rev 5721
Added tag jdk7-b98 for changeset 3046e368377b
Wed, 05 Jul 2017 17:15:57 +0200 Merge
duke [Wed, 05 Jul 2017 17:15:57 +0200] rev 5720
Merge
Fri, 18 Jun 2010 00:19:10 -0700 Merge
trims [Fri, 18 Jun 2010 00:19:10 -0700] rev 5719
Merge
Fri, 18 Jun 2010 00:09:22 -0700 Merge
trims [Fri, 18 Jun 2010 00:09:22 -0700] rev 5718
Merge
Thu, 10 Jun 2010 08:27:35 -0700 Merge
jmasa [Thu, 10 Jun 2010 08:27:35 -0700] rev 5717
Merge
Mon, 07 Jun 2010 17:46:04 -0700 6953058: G1: A bigapp crashes with SIGSEGV in compiled code
johnc [Mon, 07 Jun 2010 17:46:04 -0700] rev 5716
6953058: G1: A bigapp crashes with SIGSEGV in compiled code Summary: In C2's G1 post write barrier, the loads of the buffer and index fields from the DirtyCardQueue structure may be moved across a safepoint. Use the current value of "control" in the C2 IR to limit how far these loads can move. Reviewed-by: never, iveresov, kvn
Thu, 27 May 2010 13:09:56 -0700 6956472: test/runtime/6888954/vmerrors.sh uses ksh-specific syntax
jcoomes [Thu, 27 May 2010 13:09:56 -0700] rev 5715
6956472: test/runtime/6888954/vmerrors.sh uses ksh-specific syntax Reviewed-by: jmelvin, kvn
Mon, 24 May 2010 17:11:22 -0700 6941378: G1: change default value of G1UseFixedWindowMMUTracker to true
johnc [Mon, 24 May 2010 17:11:22 -0700] rev 5714
6941378: G1: change default value of G1UseFixedWindowMMUTracker to true Summary: Rather than changing the default value of the G1UseFixedWindowMMUTracker, the flag and associated guarantee have been removed. Reviewed-by: jcoomes, tonyp, ysr
Wed, 09 Jun 2010 13:53:58 -0400 Merge
coleenp [Wed, 09 Jun 2010 13:53:58 -0400] rev 5713
Merge
Fri, 04 Jun 2010 17:44:51 -0400 Merge
coleenp [Fri, 04 Jun 2010 17:44:51 -0400] rev 5712
Merge
Thu, 03 Jun 2010 13:34:47 -0400 Merge
acorn [Thu, 03 Jun 2010 13:34:47 -0400] rev 5711
Merge
Thu, 03 Jun 2010 13:21:47 -0400 6852873: Reduce safepoint cleanup time
acorn [Thu, 03 Jun 2010 13:21:47 -0400] rev 5710
6852873: Reduce safepoint cleanup time Summary: New optional flags to reduce inflated monitor cleanup times Reviewed-by: chrisphi, dice
Thu, 27 May 2010 17:06:39 -0400 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg [Thu, 27 May 2010 17:06:39 -0400] rev 5709
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases Summary: Check NameAndType_info signatures aggressively, even when unreferenced Reviewed-by: coleenp, acorn, never
Mon, 07 Jun 2010 14:17:01 -0700 6958485: fix for 6879921 was insufficient
never [Mon, 07 Jun 2010 14:17:01 -0700] rev 5708
6958485: fix for 6879921 was insufficient Reviewed-by: kvn
Fri, 04 Jun 2010 11:18:04 -0700 6958292: C1: Enable parallel compilation
iveresov [Fri, 04 Jun 2010 11:18:04 -0700] rev 5707
6958292: C1: Enable parallel compilation Summary: Enable parallel compilation in C1 Reviewed-by: never, kvn
Thu, 03 Jun 2010 14:20:27 -0700 6958254: -XX:+VerifyOops is broken on x86
kvn [Thu, 03 Jun 2010 14:20:27 -0700] rev 5706
6958254: -XX:+VerifyOops is broken on x86 Summary: save and restore r10 in verify_oop(). Reviewed-by: never
Thu, 17 Jun 2010 23:59:24 -0700 Merge
trims [Thu, 17 Jun 2010 23:59:24 -0700] rev 5705
Merge
Fri, 04 Jun 2010 11:54:35 -0700 Merge
trims [Fri, 04 Jun 2010 11:54:35 -0700] rev 5704
Merge
Thu, 03 Jun 2010 18:18:56 -0700 6958458: Bump the HS19 build number to 03
trims [Thu, 03 Jun 2010 18:18:56 -0700] rev 5703
6958458: Bump the HS19 build number to 03 Summary: Update the HS19 build number to 03 Reviewed-by: jcoomes
Wed, 02 Jun 2010 22:45:42 -0700 Merge
jrose [Wed, 02 Jun 2010 22:45:42 -0700] rev 5702
Merge
Wed, 02 Jun 2010 20:15:33 -0700 6930994: Code cache is full warning should be visible in product
never [Wed, 02 Jun 2010 20:15:33 -0700] rev 5701
6930994: Code cache is full warning should be visible in product Reviewed-by: kvn, twisti, ysr
Wed, 02 Jun 2010 14:23:23 -0700 6956931: assert(SafepointSynchronize::is_at_safepoint()) failed: must be executed at a safepoint
never [Wed, 02 Jun 2010 14:23:23 -0700] rev 5700
6956931: assert(SafepointSynchronize::is_at_safepoint()) failed: must be executed at a safepoint Reviewed-by: kvn, dcubed
Wed, 02 Jun 2010 12:02:49 -0700 6957882: nsk/sajdi tests failed with NullPointerException
kvn [Wed, 02 Jun 2010 12:02:49 -0700] rev 5699
6957882: nsk/sajdi tests failed with NullPointerException Summary: VM.getObjectAlignmentInBytes() accesses intxType before it is created. Reviewed-by: never
Wed, 02 Jun 2010 09:49:32 -0700 6954029: Improve implicit null check generation with compressed oops
kvn [Wed, 02 Jun 2010 09:49:32 -0700] rev 5698
6954029: Improve implicit null check generation with compressed oops Summary: Hoist DecodeN instruction above null check Reviewed-by: never, twisti
Sat, 29 May 2010 19:22:32 -0700 6957080: MethodComparator needs stress testing
jrose [Sat, 29 May 2010 19:22:32 -0700] rev 5697
6957080: MethodComparator needs stress testing Summary: Add a stress-test flag for running MethodComparator over many inputs. Fix bugs that crop up. Reviewed-by: kvn
Fri, 28 May 2010 16:23:51 -0700 6957004: MethodComparator uses the wrong CP index accessor
jrose [Fri, 28 May 2010 16:23:51 -0700] rev 5696
6957004: MethodComparator uses the wrong CP index accessor Summary: Change two uses of get_index_u2 to get_index_u2_cpcache; also tweak some debugging print functions Reviewed-by: kvn
Thu, 27 May 2010 22:01:55 -0700 6955349: C1: Make G1 barriers work with x64
iveresov [Thu, 27 May 2010 22:01:55 -0700] rev 5695
6955349: C1: Make G1 barriers work with x64 Summary: This fixes G1 barriers in c1 on x64. Reviewed-by: never
Thu, 27 May 2010 18:01:56 -0700 6916623: Align object to 16 bytes to use Compressed Oops with java heap up to 64Gb
kvn [Thu, 27 May 2010 18:01:56 -0700] rev 5694
6916623: Align object to 16 bytes to use Compressed Oops with java heap up to 64Gb Summary: Added new product ObjectAlignmentInBytes flag to control object alignment. Reviewed-by: twisti, ysr, iveresov
Thu, 27 May 2010 09:54:07 -0700 6956164: nightly regressions from 6939207
jrose [Thu, 27 May 2010 09:54:07 -0700] rev 5693
6956164: nightly regressions from 6939207 Summary: Fix errors in 6939207. Reviewed-by: kvn
Tue, 25 May 2010 13:18:49 -0700 Merge
never [Tue, 25 May 2010 13:18:49 -0700] rev 5692
Merge
Mon, 24 May 2010 13:53:38 -0700 6490487: java support on 64 bit solaris x86 machines is broken.
never [Mon, 24 May 2010 13:53:38 -0700] rev 5691
6490487: java support on 64 bit solaris x86 machines is broken. Reviewed-by: kvn, kamg
Tue, 25 May 2010 02:38:48 -0700 6934104: JSR 292 needs to support SPARC C2
twisti [Tue, 25 May 2010 02:38:48 -0700] rev 5690
6934104: JSR 292 needs to support SPARC C2 Summary: C2 for SPARC needs to support JSR 292. Reviewed-by: kvn, never
Mon, 24 May 2010 14:15:14 -0700 Merge
jrose [Mon, 24 May 2010 14:15:14 -0700] rev 5689
Merge
Sun, 23 May 2010 01:38:26 -0700 6939207: refactor constant pool index processing
jrose [Sun, 23 May 2010 01:38:26 -0700] rev 5688
6939207: refactor constant pool index processing Summary: Factored cleanup of instruction decode which prepares for enhanced ldc semantics. Reviewed-by: twisti
Fri, 21 May 2010 02:59:24 -0700 6930772: JSR 292 needs to support SPARC C1
twisti [Fri, 21 May 2010 02:59:24 -0700] rev 5687
6930772: JSR 292 needs to support SPARC C1 Summary: C1 for SPARC needs to support JSR 292. Reviewed-by: never, jrose
Thu, 20 May 2010 06:34:23 -0700 6951083: oops and relocations should part of nmethod not CodeBlob
twisti [Thu, 20 May 2010 06:34:23 -0700] rev 5686
6951083: oops and relocations should part of nmethod not CodeBlob Summary: This moves the oops from Codeblob to nmethod. Reviewed-by: kvn, never
Tue, 01 Jun 2010 11:48:33 -0700 Merge
trims [Tue, 01 Jun 2010 11:48:33 -0700] rev 5685
Merge
Wed, 26 May 2010 14:16:55 -0700 Merge
dcubed [Wed, 26 May 2010 14:16:55 -0700] rev 5684
Merge
Wed, 19 May 2010 10:19:10 -0400 6911922: JVM must throw VerifyError for jsr or jsr_w opcodes in class file v.51+
kamg [Wed, 19 May 2010 10:19:10 -0400] rev 5683
6911922: JVM must throw VerifyError for jsr or jsr_w opcodes in class file v.51+ 6693236: A class file whose version number is greater than to 50.0 must be verified using the typechecker Summary: Disable failover verification for classfiles >= v51 Reviewed-by: never, acorn, dholmes
Thu, 17 Jun 2010 16:27:59 -0700 Added tag jdk7-b98 for changeset cddc74d84e01
mikejwre [Thu, 17 Jun 2010 16:27:59 -0700] rev 5682
Added tag jdk7-b98 for changeset cddc74d84e01
Thu, 17 Jun 2010 16:27:54 -0700 Added tag jdk7-b98 for changeset eda3e9ad64dc
mikejwre [Thu, 17 Jun 2010 16:27:54 -0700] rev 5681
Added tag jdk7-b98 for changeset eda3e9ad64dc
Wed, 05 Jul 2017 17:15:36 +0200 Added tag jdk7-b98 for changeset db6e66012044
duke [Wed, 05 Jul 2017 17:15:36 +0200] rev 5680
Added tag jdk7-b98 for changeset db6e66012044
Wed, 05 Jul 2017 17:15:36 +0200 Merge jdk7-b98
duke [Wed, 05 Jul 2017 17:15:36 +0200] rev 5679
Merge
Wed, 05 Jul 2017 17:15:33 +0200 Merge
duke [Wed, 05 Jul 2017 17:15:33 +0200] rev 5678
Merge
Thu, 10 Jun 2010 13:59:19 -0700 Added tag jdk7-b97 for changeset 8dacdb7bb25b
mikejwre [Thu, 10 Jun 2010 13:59:19 -0700] rev 5677
Added tag jdk7-b97 for changeset 8dacdb7bb25b
Wed, 05 Jul 2017 17:15:31 +0200 Merge
duke [Wed, 05 Jul 2017 17:15:31 +0200] rev 5676
Merge
Thu, 10 Jun 2010 13:59:04 -0700 Added tag jdk7-b97 for changeset 84794cde307a
mikejwre [Thu, 10 Jun 2010 13:59:04 -0700] rev 5675
Added tag jdk7-b97 for changeset 84794cde307a
Wed, 05 Jul 2017 17:15:29 +0200 Merge
duke [Wed, 05 Jul 2017 17:15:29 +0200] rev 5674
Merge
Thu, 10 Jun 2010 13:59:04 -0700 Added tag jdk7-b97 for changeset c537acdc6dba
mikejwre [Thu, 10 Jun 2010 13:59:04 -0700] rev 5673
Added tag jdk7-b97 for changeset c537acdc6dba
Wed, 05 Jul 2017 17:15:26 +0200 Merge
duke [Wed, 05 Jul 2017 17:15:26 +0200] rev 5672
Merge
Thu, 10 Jun 2010 13:58:56 -0700 Added tag jdk7-b97 for changeset 75aee3dfd68e
mikejwre [Thu, 10 Jun 2010 13:58:56 -0700] rev 5671
Added tag jdk7-b97 for changeset 75aee3dfd68e
Wed, 05 Jul 2017 17:15:25 +0200 Merge
duke [Wed, 05 Jul 2017 17:15:25 +0200] rev 5670
Merge
Wed, 16 Jun 2010 15:49:13 -0700 Merge
mikejwre [Wed, 16 Jun 2010 15:49:13 -0700] rev 5669
Merge
Wed, 16 Jun 2010 09:42:39 -0700 6961079: Build JDK7 for 64 bit Windows using free Windows 7.1 SDK 64 bit compilers
prr [Wed, 16 Jun 2010 09:42:39 -0700] rev 5668
6961079: Build JDK7 for 64 bit Windows using free Windows 7.1 SDK 64 bit compilers Reviewed-by: ohair, jcoomes
Mon, 14 Jun 2010 10:37:29 -0700 6961061: make/tools/freetypecheck doesn't build with VS2010 : breaks openjdk builds
prr [Mon, 14 Jun 2010 10:37:29 -0700] rev 5667
6961061: make/tools/freetypecheck doesn't build with VS2010 : breaks openjdk builds Reviewed-by: ohair
Thu, 10 Jun 2010 13:59:09 -0700 Added tag jdk7-b97 for changeset 895b66935810
mikejwre [Thu, 10 Jun 2010 13:59:09 -0700] rev 5666
Added tag jdk7-b97 for changeset 895b66935810
Wed, 05 Jul 2017 17:15:22 +0200 Merge
duke [Wed, 05 Jul 2017 17:15:22 +0200] rev 5665
Merge
Wed, 16 Jun 2010 15:48:57 -0700 Merge
mikejwre [Wed, 16 Jun 2010 15:48:57 -0700] rev 5664
Merge
Wed, 16 Jun 2010 09:42:20 -0700 6961079: Build JDK7 for 64 bit Windows using free Windows 7.1 SDK 64 bit compilers
prr [Wed, 16 Jun 2010 09:42:20 -0700] rev 5663
6961079: Build JDK7 for 64 bit Windows using free Windows 7.1 SDK 64 bit compilers Reviewed-by: ohair, jcoomes
Thu, 10 Jun 2010 13:58:59 -0700 Added tag jdk7-b97 for changeset 3a1d6e247019
mikejwre [Thu, 10 Jun 2010 13:58:59 -0700] rev 5662
Added tag jdk7-b97 for changeset 3a1d6e247019
Wed, 16 Jun 2010 15:48:53 -0700 Merge
mikejwre [Wed, 16 Jun 2010 15:48:53 -0700] rev 5661
Merge
Wed, 16 Jun 2010 09:41:40 -0700 6961079: Build JDK7 for 64 bit Windows using free Windows 7.1 SDK 64 bit compilers
prr [Wed, 16 Jun 2010 09:41:40 -0700] rev 5660
6961079: Build JDK7 for 64 bit Windows using free Windows 7.1 SDK 64 bit compilers Reviewed-by: ohair, jcoomes
Thu, 10 Jun 2010 13:58:55 -0700 Added tag jdk7-b97 for changeset 96c2ff3f0865
mikejwre [Thu, 10 Jun 2010 13:58:55 -0700] rev 5659
Added tag jdk7-b97 for changeset 96c2ff3f0865
Wed, 05 Jul 2017 17:15:14 +0200 Added tag jdk7-b97 for changeset 7e406ebed9a5
duke [Wed, 05 Jul 2017 17:15:14 +0200] rev 5658
Added tag jdk7-b97 for changeset 7e406ebed9a5
Wed, 05 Jul 2017 17:15:14 +0200 Merge jdk7-b97
duke [Wed, 05 Jul 2017 17:15:14 +0200] rev 5657
Merge
Wed, 05 Jul 2017 17:15:12 +0200 Merge
duke [Wed, 05 Jul 2017 17:15:12 +0200] rev 5656
Merge
Mon, 07 Jun 2010 17:09:52 -0700 Merge
lana [Mon, 07 Jun 2010 17:09:52 -0700] rev 5655
Merge
Fri, 28 May 2010 12:41:48 -0700 Merge
lana [Fri, 28 May 2010 12:41:48 -0700] rev 5654
Merge
Mon, 24 May 2010 09:07:04 -0700 Merge
lana [Mon, 24 May 2010 09:07:04 -0700] rev 5653
Merge
Fri, 21 May 2010 17:32:19 -0700 6954901: langtools/test/Makefile should check for bin/javac(.exe) instead of lib/tools.jar
jjg [Fri, 21 May 2010 17:32:19 -0700] rev 5652
6954901: langtools/test/Makefile should check for bin/javac(.exe) instead of lib/tools.jar Reviewed-by: ohair
Wed, 19 May 2010 16:43:30 +0100 6951833: latest diamond implementation generates spurious raw type warnings
mcimadamore [Wed, 19 May 2010 16:43:30 +0100] rev 5651
6951833: latest diamond implementation generates spurious raw type warnings Summary: Raw warning checks should be disabled in the presence of a diamond AST node Reviewed-by: jjg
Wed, 19 May 2010 16:43:06 +0100 6948381: javac Null Pointer Exception in Types.makeCompoundType
mcimadamore [Wed, 19 May 2010 16:43:06 +0100] rev 5650
6948381: javac Null Pointer Exception in Types.makeCompoundType Summary: Race condition between symbol completion and attribution of import statements causes NPE when creating intersection type Reviewed-by: jjg
Wed, 19 May 2010 16:42:37 +0100 6946618: sqe test fails: javac/generics/NewOnTypeParm in pit jdk7 b91 in all platforms.
mcimadamore [Wed, 19 May 2010 16:42:37 +0100] rev 5649
6946618: sqe test fails: javac/generics/NewOnTypeParm in pit jdk7 b91 in all platforms. Summary: Bad cast to ClassType in the new diamond implementation fails if the target type of the instance creation expression is a type-variable Reviewed-by: jjg
Wed, 19 May 2010 16:41:57 +0100 6880344: Recursive type parameters do not compile
mcimadamore [Wed, 19 May 2010 16:41:57 +0100] rev 5648
6880344: Recursive type parameters do not compile Summary: Issue in type-variable substitution causes valid code to be rejected Reviewed-by: jjg
(0) -3000 -1000 -300 -100 -96 +96 +100 +300 +1000 +3000 +10000 +30000 tip