← Back to branch summary

~ubuntu-branches/ubuntu/precise/openjdk-7/precise-security

« back to all changes in this revision

Viewing changes to patches/use-idx_t.patch

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Klose, Damien Raude-Morvan, Matthias Klose
  • Date: 2011-07-10 14:28:17 UTC
  • mfrom: (1.1.4 upstream) (8.1.2 experimental)
  • Revision ID: james.westby@ubuntu.com-20110710142817-tl5xz1zv1aejnbi1
Tags: 7~b143-2.0~pre1-1
[ Damien Raude-Morvan ]
* New b143 code drop.
* Drop d/patches/7031385.diff: Merged upstream.
* Drop d/patches/jamvm-oj7.patch: Merged upstream.
* Manpages are now ja_JP.UTF-8 instead of ja_JP.eucJP

[ Matthias Klose ]
* Apply fix for IcedTea issue #753, #757.
* Update s390 hotspot build fixes.
* Re-enable zero on i386.

Show diffs side-by-side

added added

removed removed

Lines of Context:
patches/use-idx_t.patch
1
 
diff -Nru openjdk.orig/hotspot/src/share/vm/compiler/methodLiveness.cpp openjdk/hotspot/src/share/vm/compiler/methodLiveness.cpp
2
 
--- openjdk.orig/hotspot/src/share/vm/compiler/methodLiveness.cpp       2008-11-06 08:40:55.000000000 +0000
3
 
+++ openjdk/hotspot/src/share/vm/compiler/methodLiveness.cpp    2008-11-10 00:55:09.000000000 +0000
4
 
@@ -567,15 +567,15 @@
5
 
 
6
 
 
7
 
 MethodLiveness::BasicBlock::BasicBlock(MethodLiveness *analyzer, int start, int limit) :
8
 
-         _gen((uintptr_t*)analyzer->arena()->Amalloc(BytesPerWord * analyzer->bit_map_size_words()),
9
 
+         _gen((size_t*)analyzer->arena()->Amalloc(BytesPerWord * analyzer->bit_map_size_words()),
10
 
                          analyzer->bit_map_size_bits()),
11
 
-         _kill((uintptr_t*)analyzer->arena()->Amalloc(BytesPerWord * analyzer->bit_map_size_words()),
12
 
+         _kill((size_t*)analyzer->arena()->Amalloc(BytesPerWord * analyzer->bit_map_size_words()),
13
 
                          analyzer->bit_map_size_bits()),
14
 
-         _entry((uintptr_t*)analyzer->arena()->Amalloc(BytesPerWord * analyzer->bit_map_size_words()),
15
 
+         _entry((size_t*)analyzer->arena()->Amalloc(BytesPerWord * analyzer->bit_map_size_words()),
16
 
                          analyzer->bit_map_size_bits()),
17
 
-         _normal_exit((uintptr_t*)analyzer->arena()->Amalloc(BytesPerWord * analyzer->bit_map_size_words()),
18
 
+         _normal_exit((size_t*)analyzer->arena()->Amalloc(BytesPerWord * analyzer->bit_map_size_words()),
19
 
                          analyzer->bit_map_size_bits()),
20
 
-         _exception_exit((uintptr_t*)analyzer->arena()->Amalloc(BytesPerWord * analyzer->bit_map_size_words()),
21
 
+         _exception_exit((size_t*)analyzer->arena()->Amalloc(BytesPerWord * analyzer->bit_map_size_words()),
22
 
                          analyzer->bit_map_size_bits()),
23
 
          _last_bci(-1) {
24
 
   _analyzer = analyzer;
25
 
@@ -992,7 +992,7 @@
26
 
 }
27
 
 
28
 
 MethodLivenessResult MethodLiveness::BasicBlock::get_liveness_at(ciMethod* method, int bci) {
29
 
-  MethodLivenessResult answer(NEW_RESOURCE_ARRAY(uintptr_t, _analyzer->bit_map_size_words()),
30
 
+  MethodLivenessResult answer(NEW_RESOURCE_ARRAY(size_t, _analyzer->bit_map_size_words()),
31
 
                 _analyzer->bit_map_size_bits());
32
 
   answer.set_is_valid();
33
 
 
34
1
diff -Nru openjdk.orig/hotspot/src/share/vm/utilities/bitMap.hpp openjdk/hotspot/src/share/vm/utilities/bitMap.hpp
35
2
--- openjdk.orig/hotspot/src/share/vm/utilities/bitMap.hpp      2008-11-06 08:40:58.000000000 +0000
36
3
+++ openjdk/hotspot/src/share/vm/utilities/bitMap.hpp   2008-11-10 00:57:20.000000000 +0000