From 077bd840a3e7a91cf57b87f825f63e85bf2a4eca Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Sun, 4 Jan 2015 15:21:53 +0530 Subject: [PATCH 1/2] Ban Cell> and Cell> (partial #4336) --- components/plugins/lib.rs | 1 + components/plugins/lints/ban.rs | 39 +++++++++++++++++++++++++++++++++ components/plugins/lints/mod.rs | 1 + 3 files changed, 41 insertions(+) create mode 100644 components/plugins/lints/ban.rs diff --git a/components/plugins/lib.rs b/components/plugins/lib.rs index 5a4a7554a8e..6bf06c53b64 100644 --- a/components/plugins/lib.rs +++ b/components/plugins/lib.rs @@ -49,6 +49,7 @@ pub fn plugin_registrar(reg: &mut Registry) { reg.register_lint_pass(box lints::privatize::PrivatizePass as LintPassObject); reg.register_lint_pass(box lints::inheritance_integrity::InheritancePass as LintPassObject); reg.register_lint_pass(box lints::str_to_string::StrToStringPass as LintPassObject); + reg.register_lint_pass(box lints::ban::BanPass as LintPassObject); } diff --git a/components/plugins/lints/ban.rs b/components/plugins/lints/ban.rs new file mode 100644 index 00000000000..78761c274f4 --- /dev/null +++ b/components/plugins/lints/ban.rs @@ -0,0 +1,39 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +use syntax::ast; +use rustc::lint::{Context, LintPass, LintArray}; +use utils::match_ty_unwrap; + +declare_lint!(BANNED_TYPE, Deny, + "Ban various unsafe type combinations") + +/// Lint for banning various unsafe types +/// +/// Banned types: +/// +/// - `Cell` +/// - `Cell>` +pub struct BanPass; + +impl LintPass for BanPass { + fn get_lints(&self) -> LintArray { + lint_array!(BANNED_TYPE) + } + + fn check_ty(&mut self, cx: &Context, ty: &ast::Ty) { + if match_ty_unwrap(ty, &["std","cell","Cell"]) + .and_then(|t| t.get(0)) + .and_then(|t| match_ty_unwrap(&**t, &["dom", "bindings", "js", "JS"])) + .is_some() { + cx.span_lint(BANNED_TYPE, ty.span, "Banned type Cell> detected. Use MutHeap> instead") + } + if match_ty_unwrap(ty, &["std","cell","Cell"]) + .and_then(|t| t.get(0)) + .and_then(|t| match_ty_unwrap(&**t, &["js", "jsval", "JSVal"])) + .is_some() { + cx.span_lint(BANNED_TYPE, ty.span, "Banned type Cell detected. Use MutHeap instead") + } + } +} diff --git a/components/plugins/lints/mod.rs b/components/plugins/lints/mod.rs index b40e59e4417..45a3c6a7eda 100644 --- a/components/plugins/lints/mod.rs +++ b/components/plugins/lints/mod.rs @@ -2,6 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +pub mod ban; pub mod inheritance_integrity; pub mod privatize; pub mod str_to_string; From 6225bc63095bb79ffd4f316451a81bed00affbd1 Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Sun, 4 Jan 2015 20:23:45 +0530 Subject: [PATCH 2/2] Mention MutHeap in DESIGN.md --- components/script/dom/bindings/DESIGN.md | 1 + 1 file changed, 1 insertion(+) diff --git a/components/script/dom/bindings/DESIGN.md b/components/script/dom/bindings/DESIGN.md index 2dc54c74548..e47d7467609 100644 --- a/components/script/dom/bindings/DESIGN.md +++ b/components/script/dom/bindings/DESIGN.md @@ -37,3 +37,4 @@ For supporting SpiderMonkey’s exact GC rooting, we introduce [some types](http - `Root` contains the pointer to `JSObject` which the represented DOM type has. SpiderMonkey's conservative stack scanner scans it's pointers and marks a pointed `JSObject` as GC root. - `JSRef` is just a reference to the value rooted by `Root`. - `RootCollection` is used to dynamically check if rooting satisfies LIFO ordering, because SpiderMonkey's GC requires LIFO order (See also: [Exact Stack Rooting - Storing a GCPointer on the CStack](https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey/Internals/GC/Exact_Stack_Rooting)). + - `MutHeap` is a version of `Cell` that is safe to use for internal mutability of Spidermonkey heap objects like `JSVal` and `JS` \ No newline at end of file