HCoop / jackhill / guix / guix.git / blame
| Commit | Line | Data |
|---|---|---|
| 1cdff8cd GB |
1 | # HG changeset patch |
| 2 | # User Gábor Boskovits <boskovits@gmail.com> | |
| 3 | # Date 1530519413 -7200 | |
| 4 | # Mon Jul 02 10:16:53 2018 +0200 | |
| 5 | # Node ID 77e5bc9e238a28d17e097647badc04ed67a6a452 | |
| 6 | # Parent 1ae05a34e052d1672b4a7894ddf5fc2f662eb861 | |
| 7 | Fix gcc segfault. | |
| 8 | ||
| 9 | diff -r 1ae05a34e052 -r 77e5bc9e238a src/share/vm/opto/output.cpp | |
| 10 | --- a/src/share/vm/opto/output.cpp Sun Dec 25 23:52:13 2016 +0000 | |
| 11 | +++ b/src/share/vm/opto/output.cpp Mon Jul 02 10:16:53 2018 +0200 | |
| 12 | @@ -1758,6 +1758,8 @@ | |
| 13 | ||
| 14 | // Initializer for class Scheduling | |
| 15 | ||
| 16 | +volatile const void *eePointer = Pipeline_Use::elaborated_elements; | |
| 17 | + | |
| 18 | Scheduling::Scheduling(Arena *arena, Compile &compile) | |
| 19 | : _arena(arena), | |
| 20 | _cfg(compile.cfg()), | |
| 21 | @@ -1802,8 +1804,8 @@ | |
| 22 | ||
| 23 | // Clear the bundling information | |
| 24 | memcpy(_bundle_use_elements, | |
| 25 | - Pipeline_Use::elaborated_elements, | |
| 26 | - sizeof(Pipeline_Use::elaborated_elements)); | |
| 27 | + (void *)eePointer, | |
| 28 | + 11*sizeof(Pipeline_Use_Element)); | |
| 29 | ||
| 30 | // Get the last node | |
| 31 | Block *bb = _cfg->_blocks[_cfg->_blocks.size()-1]; | |
| 32 | @@ -1854,8 +1856,8 @@ | |
| 33 | _bundle_use.reset(); | |
| 34 | ||
| 35 | memcpy(_bundle_use_elements, | |
| 36 | - Pipeline_Use::elaborated_elements, | |
| 37 | - sizeof(Pipeline_Use::elaborated_elements)); | |
| 38 | + (void *)eePointer, | |
| 39 | + 11*sizeof(Pipeline_Use_Element)); | |
| 40 | } | |
| 41 | ||
| 42 | //------------------------------ScheduleAndBundle------------------------------ |