Skip to content

setting ABORTING_MALLOC=0 for asmjs backend #49050

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 16, 2018
Merged

setting ABORTING_MALLOC=0 for asmjs backend #49050

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions src/liballoc/tests/string.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,8 @@
// except according to those terms.

use std::borrow::Cow;
#[cfg(not(target_arch = "asmjs"))]
use std::collections::CollectionAllocErr::*;
#[cfg(not(target_arch = "asmjs"))]
use std::mem::size_of;
#[cfg(not(target_arch = "asmjs"))]
use std::{usize, isize};

pub trait IntoCow<'a, B: ?Sized> where B: ToOwned {
Expand Down Expand Up @@ -535,7 +532,6 @@ fn test_reserve_exact() {
assert!(s.capacity() >= 33)
}

#[cfg(not(target_arch = "asmjs"))]
#[test]
fn test_try_reserve() {

Expand Down Expand Up @@ -613,7 +609,6 @@ fn test_try_reserve() {

}

#[cfg(not(target_arch = "asmjs"))]
#[test]
fn test_try_reserve_exact() {

Expand Down
7 changes: 1 addition & 6 deletions src/liballoc/tests/vec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,8 @@

use std::borrow::Cow;
use std::mem::size_of;
use std::{usize, panic};
#[cfg(not(target_arch = "asmjs"))]
use std::isize;
use std::{usize, isize, panic};
use std::vec::{Drain, IntoIter};
#[cfg(not(target_arch = "asmjs"))]
use std::collections::CollectionAllocErr::*;

struct DropCounter<'a> {
Expand Down Expand Up @@ -994,7 +991,6 @@ fn test_reserve_exact() {
assert!(v.capacity() >= 33)
}

#[cfg(not(target_arch = "asmjs"))]
#[test]
fn test_try_reserve() {

Expand Down Expand Up @@ -1097,7 +1093,6 @@ fn test_try_reserve() {

}

#[cfg(not(target_arch = "asmjs"))]
#[test]
fn test_try_reserve_exact() {

Expand Down
8 changes: 1 addition & 7 deletions src/liballoc/tests/vec_deque.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,9 @@
use std::collections::VecDeque;
use std::fmt::Debug;
use std::collections::vec_deque::{Drain};
#[cfg(not(target_arch = "asmjs"))]
use std::collections::CollectionAllocErr::*;
#[cfg(not(target_arch = "asmjs"))]
use std::mem::size_of;
use std::isize;
#[cfg(not(target_arch = "asmjs"))]
use std::usize;
use std::{usize, isize};

use self::Taggy::*;
use self::Taggypar::*;
Expand Down Expand Up @@ -1053,7 +1049,6 @@ fn test_reserve_exact_2() {
assert!(v.capacity() >= 48)
}

#[cfg(not(target_arch = "asmjs"))]
#[test]
fn test_try_reserve() {

Expand Down Expand Up @@ -1155,7 +1150,6 @@ fn test_try_reserve() {

}

#[cfg(not(target_arch = "asmjs"))]
#[test]
fn test_try_reserve_exact() {

Expand Down
4 changes: 3 additions & 1 deletion src/librustc_back/target/asmjs_unknown_emscripten.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ pub fn target() -> Result<Target, String> {
let mut args = LinkArgs::new();
args.insert(LinkerFlavor::Em,
vec!["-s".to_string(),
"ERROR_ON_UNDEFINED_SYMBOLS=1".to_string()]);
"ERROR_ON_UNDEFINED_SYMBOLS=1".to_string(),
"-s".to_string(),
"ABORTING_MALLOC=0".to_string()]);

let opts = TargetOptions {
dynamic_linking: false,
Expand Down
4 changes: 0 additions & 4 deletions src/libstd/collections/hash/map.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2755,11 +2755,8 @@ mod test_map {
use cell::RefCell;
use rand::{thread_rng, Rng};
use panic;
#[cfg(not(target_arch = "asmjs"))]
use realstd::collections::CollectionAllocErr::*;
#[cfg(not(target_arch = "asmjs"))]
use realstd::mem::size_of;
#[cfg(not(target_arch = "asmjs"))]
use realstd::usize;

#[test]
Expand Down Expand Up @@ -3696,7 +3693,6 @@ mod test_map {
assert_eq!(hm.len(), 0);
}

#[cfg(not(target_arch = "asmjs"))]
#[test]
fn test_try_reserve() {

Expand Down